Merge commit '8e104619a627fcf5f4c2bd3c09d0c2d323aae745'

[ffmpeg] / libavformat / movenc.h

diff --git a/libavformat/movenc.h b/libavformat/movenc.h
index 8490a4253d58abc7ee4fdd93e29e4340a7c04e6a..89230ac23140b357f7b0d15000010042cdb0aa27 100644 (file)
--- a/libavformat/movenc.h
+++ b/libavformat/movenc.h
@@ -173,7 +173,6 @@ typedef struct MOVMuxContext {
     AVIOContext *mdat_buf;
     int first_trun;
 
-    int use_editlist;
     int video_track_timescale;
 
     int reserved_moov_size; ///< 0 for disabled, -1 for automatic, size otherwise
@@ -183,6 +182,8 @@ typedef struct MOVMuxContext {
 
     int per_stream_grouping;
     AVFormatContext *fc;
+
+    int use_editlist;
 } MOVMuxContext;
 
 #define FF_MOV_FLAG_RTP_HINT              (1 <<  0)