diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-10 11:42:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-10 11:42:44 +0100 |
| commit | f8f324cc16c34d0204f2ce0d9eb20bac8b685a9c (patch) | |
| tree | 0b280c37dfc2658574cf34baf38c7b11a4ae340b /libavformat/movenc.h | |
| parent | 8d026861f5c2afa3f445e2ffdc67b563b06e2dcb (diff) | |
| parent | 448c8cfe4c53e9e806effd8505b46d57fa707061 (diff) | |
| download | ffmpeg-f8f324cc16c34d0204f2ce0d9eb20bac8b685a9c.tar.gz | |
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>
Diffstat (limited to 'libavformat/movenc.h')
| -rw-r--r-- | libavformat/movenc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/movenc.h b/libavformat/movenc.h index 322ba9ff03..9605155cde 100644 --- a/libavformat/movenc.h +++ b/libavformat/movenc.h @@ -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; |