Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / isom.h

diff --git a/libavformat/isom.h b/libavformat/isom.h
index cd70c0305a806f7fa26262bbe7284613c328a9a4..542b76bf3003ea1060ed173f103835f8a9c7ad5b 100644 (file)
--- a/libavformat/isom.h
+++ b/libavformat/isom.h
@@ -103,9 +103,11 @@ typedef struct MOVStreamContext {
     unsigned *stps_data;  ///< partial sync sample for mpeg-2 open gop
     int ctts_index;
     int ctts_sample;
-    unsigned int sample_size;
+    unsigned int sample_size; ///< may contain value calculated from stsd or value from stsz atom
+    unsigned int alt_sample_size; ///< always contains sample size from stsz atom
     unsigned int sample_count;
     int *sample_sizes;
+    int keyframe_absent;
     unsigned int keyframe_count;
     int *keyframes;
     int time_scale;