Merge commit 'b51c7c6b8a5b35cfd06cb9655f9ec4c9f0ddd81b'

[ffmpeg] / libavformat / movenc.h

diff --git a/libavformat/movenc.h b/libavformat/movenc.h
index 1090085a5ac51af6369fa69f5f7f397930a981b3..6e9f5ace725e8032e967f2189fa70d0dc19c4bbd 100644 (file)
--- a/libavformat/movenc.h
+++ b/libavformat/movenc.h
@@ -115,6 +115,7 @@ typedef struct MOVTrack {
     int64_t     start_dts;
     int64_t     start_cts;
     int64_t     end_pts;
+    int         end_reliable;
 
     int         hint_track;   ///< the track that hints this track, -1 if no hint track is set
     int         src_track;    ///< the track that this hint (or tmcd) track describes
@@ -233,6 +234,7 @@ typedef struct MOVMuxContext {
 #define FF_MOV_FLAG_GLOBAL_SIDX           (1 << 14)
 #define FF_MOV_FLAG_WRITE_COLR            (1 << 15)
 #define FF_MOV_FLAG_WRITE_GAMA            (1 << 16)
+#define FF_MOV_FLAG_USE_MDTA              (1 << 17)
 
 int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt);