diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-26 11:27:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-26 11:27:17 +0100 |
| commit | b78074fd13ad340b8ea4bb83440da336a0de1e40 (patch) | |
| tree | ff8729c5be0ce419330d8b3dde03cfb327b0b7a5 /libavformat/movenc.h | |
| parent | 5f30522894d19a14324b80bc282c094dabdb31c0 (diff) | |
| parent | ee37620b6ae4783cda637408422044b2d14a688c (diff) | |
| download | ffmpeg-b78074fd13ad340b8ea4bb83440da336a0de1e40.tar.gz | |
Merge commit 'ee37620b6ae4783cda637408422044b2d14a688c'
* commit 'ee37620b6ae4783cda637408422044b2d14a688c':
movenc: Add a flag for indicating a discontinuous fragment
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/movenc.h')
| -rw-r--r-- | libavformat/movenc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/movenc.h b/libavformat/movenc.h index 997a1fb1f9..4cf6e3b6d9 100644 --- a/libavformat/movenc.h +++ b/libavformat/movenc.h @@ -129,6 +129,7 @@ typedef struct MOVTrack { AVIOContext *mdat_buf; int64_t data_offset; int64_t frag_start; + int frag_discont; int nb_frag_info; MOVFragmentInfo *frag_info; @@ -198,6 +199,7 @@ typedef struct MOVMuxContext { #define FF_MOV_FLAG_DISABLE_CHPL (1 << 9) #define FF_MOV_FLAG_DEFAULT_BASE_MOOF (1 << 10) #define FF_MOV_FLAG_DASH (1 << 11) +#define FF_MOV_FLAG_FRAG_DISCONT (1 << 12) int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt); |