diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-16 23:30:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-16 23:30:13 +0100 |
| commit | ae65cc7ed3647a769ded853cc2771eda5c11b66e (patch) | |
| tree | dc41420fb6364c62acd195e21d71a204c20d2738 /libavformat/movenc.h | |
| parent | 730f3c49e0821cd156b0ff714a098d202c9673df (diff) | |
| parent | 2cb9c2fc59c9267ad2631c07c81c188058502259 (diff) | |
| download | ffmpeg-ae65cc7ed3647a769ded853cc2771eda5c11b66e.tar.gz | |
Merge commit '2cb9c2fc59c9267ad2631c07c81c188058502259'
* commit '2cb9c2fc59c9267ad2631c07c81c188058502259':
movenc: Allow interleaving samples when writing fragmented files
Conflicts:
libavformat/movenc.c
libavformat/movenc.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/movenc.h')
| -rw-r--r-- | libavformat/movenc.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/movenc.h b/libavformat/movenc.h index 9605155cde..dfd4cc48cc 100644 --- a/libavformat/movenc.h +++ b/libavformat/movenc.h @@ -131,6 +131,7 @@ typedef struct MOVTrack { int64_t data_offset; int64_t frag_start; int frag_discont; + int entries_flushed; int nb_frag_info; MOVFragmentInfo *frag_info; @@ -189,6 +190,8 @@ typedef struct MOVMuxContext { int use_editlist; float gamma; + + int frag_interleave; } MOVMuxContext; #define FF_MOV_FLAG_RTP_HINT (1 << 0) |