diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-02 22:00:02 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-02 22:13:20 +0100 |
commit | 781a5a392c4d0da5250c28a153c14f88aad09a73 (patch) | |
tree | 880b27be8532207156741ac4fc5c89a4a5feeec3 /libavformat/isom.h | |
parent | 302ed9c43f2d2a0764a9f9d2a4b2e512d2c9592f (diff) | |
parent | e352b293712ff7cbde67eba3ce3f8510b037de09 (diff) |
Merge commit 'e352b293712ff7cbde67eba3ce3f8510b037de09'
* commit 'e352b293712ff7cbde67eba3ce3f8510b037de09':
mov: Add an option for exporting all metadata
Conflicts:
libavformat/isom.h
libavformat/mov.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/isom.h')
-rw-r--r-- | libavformat/isom.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/isom.h b/libavformat/isom.h index 52da1a3217..074837f028 100644 --- 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; |