Merge commit '448c8cfe4c53e9e806effd8505b46d57fa707061'

* commit '448c8cfe4c53e9e806effd8505b46d57fa707061':
  movenc: Support setting fragment_index before the moov atom is written

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-03-10 11:42:44 +01:00
2 changed files with 10 additions and 8 deletions

View File

@@ -168,6 +168,7 @@ typedef struct MOVMuxContext {
int iods_video_profile;
int iods_audio_profile;
int moov_written;
int fragments;
int max_fragment_duration;
int min_fragment_duration;