diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 01:50:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 01:50:26 +0100 |
| commit | f4c8d002231afbc181e97c512e459ec6860f7098 (patch) | |
| tree | 1e54b1287f49f89e3156284c40b5b87365c9a10a /libavutil | |
| parent | ca9f7e1832785414362bb8aeef1c7eb0a454d92e (diff) | |
| parent | 6bb8720f00e2e6209665f819fb351fd42b82d5d0 (diff) | |
| download | ffmpeg-f4c8d002231afbc181e97c512e459ec6860f7098.tar.gz | |
Merge commit '6bb8720f00e2e6209665f819fb351fd42b82d5d0'
* commit '6bb8720f00e2e6209665f819fb351fd42b82d5d0':
AVOptions: deprecate unused AV_OPT_FLAG_METADATA
Conflicts:
doc/APIchanges
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/opt.h | 2 | ||||
| -rw-r--r-- | libavutil/version.h | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libavutil/opt.h b/libavutil/opt.h index 14faa6e066..56b0e0f6ba 100644 --- a/libavutil/opt.h +++ b/libavutil/opt.h @@ -282,7 +282,9 @@ typedef struct AVOption { int flags; #define AV_OPT_FLAG_ENCODING_PARAM 1 ///< a generic parameter which can be set by the user for muxing or encoding #define AV_OPT_FLAG_DECODING_PARAM 2 ///< a generic parameter which can be set by the user for demuxing or decoding +#if FF_API_OPT_TYPE_METADATA #define AV_OPT_FLAG_METADATA 4 ///< some data extracted or inserted into the file like title, comment, ... +#endif #define AV_OPT_FLAG_AUDIO_PARAM 8 #define AV_OPT_FLAG_VIDEO_PARAM 16 #define AV_OPT_FLAG_SUBTITLE_PARAM 32 diff --git a/libavutil/version.h b/libavutil/version.h index 7bc12612fb..3d2509719c 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -57,7 +57,7 @@ #define LIBAVUTIL_VERSION_MAJOR 52 #define LIBAVUTIL_VERSION_MINOR 64 -#define LIBAVUTIL_VERSION_MICRO 100 +#define LIBAVUTIL_VERSION_MICRO 101 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ @@ -134,6 +134,9 @@ #ifndef FF_API_INTFLOAT #define FF_API_INTFLOAT (LIBAVUTIL_VERSION_MAJOR < 54) #endif +#ifndef FF_API_OPT_TYPE_METADATA +#define FF_API_OPT_TYPE_METADATA (LIBAVUTIL_VERSION_MAJOR < 54) +#endif /** * @} |