Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / movenc.h

diff --git a/libavformat/movenc.h b/libavformat/movenc.h
index 10181177c8845c13a381d9b636cf8d6c0db7a1d8..4cf40f231dd1370816bcf33e1008e479b5751fa9 100644 (file)
--- a/libavformat/movenc.h
+++ b/libavformat/movenc.h
@@ -44,7 +44,7 @@ typedef struct MOVIentry {
     uint64_t     pos;
     int64_t      dts;
     unsigned int size;
-    unsigned int samplesInChunk;
+    unsigned int samples_in_chunk;
     unsigned int chunkNum;              ///< Chunk number if the current entry is a chunk start otherwise 0
     unsigned int entries;
     int          cts;
@@ -79,21 +79,21 @@ typedef struct MOVIndex {
     int         entry;
     unsigned    timescale;
     uint64_t    time;
-    int64_t     trackDuration;
-    long        sampleCount;
-    long        sampleSize;
+    int64_t     track_duration;
+    long        sample_count;
+    long        sample_size;
     long        chunkCount;
-    int         hasKeyframes;
+    int         has_keyframes;
 #define MOV_TRACK_CTTS         0x0001
 #define MOV_TRACK_STPS         0x0002
     uint32_t    flags;
     int         language;
-    int         trackID;
+    int         track_id;
     int         tag; ///< stsd fourcc
     AVCodecContext *enc;
 
-    int         vosLen;
-    uint8_t     *vosData;
+    int         vos_len;
+    uint8_t     *vos_data;
     MOVIentry   *cluster;
     int         audio_vbr;
     int         height; ///< active picture (w/o VBI) height for D-10/IMX
@@ -122,6 +122,15 @@ typedef struct MOVIndex {
 
     int         nb_frag_info;
     MOVFragmentInfo *frag_info;
+
+    struct {
+        int64_t struct_offset;
+        int     first_packet_seq;
+        int     first_packet_entry;
+        int     packet_seq;
+        int     packet_entry;
+        int     slices;
+    } vc1_info;
 } MOVTrack;
 
 typedef struct MOVMuxContext {
@@ -147,6 +156,7 @@ typedef struct MOVMuxContext {
     int max_fragment_duration;
     int max_fragment_size;
     int ism_lookahead;
+    AVIOContext *mdat_buf;
 } MOVMuxContext;
 
 #define FF_MOV_FLAG_RTP_HINT 1