Merge commit '675ac56b7ee0f204963fde55295197c5df80aa91'

[ffmpeg] / libavformat / movenc.h

diff --git a/libavformat/movenc.h b/libavformat/movenc.h
index 89230ac23140b357f7b0d15000010042cdb0aa27..4cf6e3b6d9a3e193bebf954415872f4d0b202bd8 100644 (file)
--- a/libavformat/movenc.h
+++ b/libavformat/movenc.h
@@ -74,6 +74,7 @@ typedef struct MOVFragmentInfo {
     int64_t time;
     int64_t duration;
     int64_t tfrf_offset;
+    int size;
 } MOVFragmentInfo;
 
 typedef struct MOVTrack {
@@ -128,7 +129,7 @@ typedef struct MOVTrack {
     AVIOContext *mdat_buf;
     int64_t     data_offset;
     int64_t     frag_start;
-    int64_t     tfrf_offset;
+    int         frag_discont;
 
     int         nb_frag_info;
     MOVFragmentInfo *frag_info;
@@ -197,6 +198,8 @@ typedef struct MOVMuxContext {
 #define FF_MOV_FLAG_OMIT_TFHD_OFFSET      (1 <<  8)
 #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);