Skip to content
Snippets Groups Projects
Commit 9ebfe38f authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '9a5ac36b' 


* commit '9a5ac36b':
  movenc: Require samples before trying to write edts

Conflicts:
	libavformat/movenc.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 4342b346 9a5ac36b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 8 additions and 5 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment