Merge commit 'eb8a8115994434b548523cf0bca6a4a74784e79c'

[ffmpeg] / libavformat / isom.h

diff --git a/libavformat/isom.h b/libavformat/isom.h
index 51abea52de95f4069f9cfc6ebf0c13459e3f8249..69452cae8e58fdac3ae4324e379341bfebce8de2 100644 (file)
--- a/libavformat/isom.h
+++ b/libavformat/isom.h
@@ -41,6 +41,7 @@ extern const AVCodecTag ff_mp4_obj_type[];
 extern const AVCodecTag ff_codec_movvideo_tags[];
 extern const AVCodecTag ff_codec_movaudio_tags[];
 extern const AVCodecTag ff_codec_movsubtitle_tags[];
+extern const AVCodecTag ff_codec_movdata_tags[];
 
 int ff_mov_iso639_to_lang(const char lang[4], int mp4);
 int ff_mov_lang_to_iso639(unsigned code, char to[4]);
@@ -86,6 +87,7 @@ typedef struct MOVAtom {
 struct MOVParseTableEntry;
 
 typedef struct MOVFragment {
+    int found_tfhd;
     unsigned track_id;
     uint64_t base_data_offset;
     uint64_t moof_offset;
@@ -217,6 +219,7 @@ typedef struct MOVStreamContext {
     int *extradata_size;
     int last_stsd_index;
     int stsd_count;
+    int stsd_version;
 
     int32_t *display_matrix;
     AVStereo3D *stereo3d;