Merge commit '4fd7e63c87226584e60200b82630a6057c0a6663'

[ffmpeg] / libavformat / isom.h

diff --git a/libavformat/isom.h b/libavformat/isom.h
index 52da1a3217561d6851cc7d54cbf801d603b645be..e3160d00f816048e302926353c4382a2f6d0720f 100644 (file)
--- a/libavformat/isom.h
+++ b/libavformat/isom.h
@@ -164,7 +164,7 @@ typedef struct MOVStreamContext {
 } MOVStreamContext;
 
 typedef struct MOVContext {
-    AVClass *avclass;
+    const AVClass *class; ///< class for private options
     AVFormatContext *fc;
     int time_scale;
     int64_t duration;     ///< duration of the longest track
@@ -181,6 +181,7 @@ typedef struct MOVContext {
     int use_absolute_path;
     int ignore_editlist;
     int64_t next_root_atom; ///< offset of the next root atom
+    int export_all;
     int *bitrates;          ///< bitrates read before streams creation
     int bitrates_count;
     int moov_retry;
@@ -245,6 +246,7 @@ void ff_mp4_parse_es_descr(AVIOContext *pb, int *es_id);
      (tag) == MKTAG('a', 'i', '1', '3') ||  \
      (tag) == MKTAG('a', 'i', '1', '5') ||  \
      (tag) == MKTAG('a', 'i', '1', '6') ||  \
+     (tag) == MKTAG('a', 'i', 'v', 'x') ||  \
      (tag) == MKTAG('A', 'V', 'i', 'n'))