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

Merge commit '847bf598' 


* commit '847bf598':
  movenc: Add an option for delaying writing the moov with empty_moov

Conflicts:
	libavformat/movenc.c
	libavformat/version.h

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 504267fb 847bf598
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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