diff options
| author | Anton Khirnov <anton@khirnov.net> | 2014-02-15 08:14:03 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-02-19 21:52:17 +0100 |
| commit | 6bb8720f00e2e6209665f819fb351fd42b82d5d0 (patch) | |
| tree | ab2e59c9796541a77c17cddacc4da4d9755ff971 | |
| parent | 521726ff577ca80b399d1abb687e3e1fd4840e4a (diff) | |
| download | ffmpeg-6bb8720f00e2e6209665f819fb351fd42b82d5d0.tar.gz | |
AVOptions: deprecate unused AV_OPT_FLAG_METADATA
It was never used since it was added and the things it was intended for
are now exported differently.
| -rw-r--r-- | doc/APIchanges | 3 | ||||
| -rw-r--r-- | libavutil/opt.h | 2 | ||||
| -rw-r--r-- | libavutil/version.h | 5 |
3 files changed, 9 insertions, 1 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index d3939e4e12..e25728a568 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,9 @@ libavutil: 2013-12-xx API changes, most recent first: +2014-xx-xx - xxxxxxx - lavu 53.03.01 - opt.h + Deprecate unused AV_OPT_FLAG_METADATA. + 2014-02-xx - xxxxxxx - lavu 53.3.0 - frame.h Add AV_FRAME_DATA_DOWNMIX_INFO value to the AVFrameSideDataType enum and downmix_info.h API, which identify downmix-related metadata. diff --git a/libavutil/opt.h b/libavutil/opt.h index 0181379b78..2568a7103e 100644 --- a/libavutil/opt.h +++ b/libavutil/opt.h @@ -262,7 +262,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 5196a674de..74946d0f5c 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -55,7 +55,7 @@ #define LIBAVUTIL_VERSION_MAJOR 53 #define LIBAVUTIL_VERSION_MINOR 3 -#define LIBAVUTIL_VERSION_MICRO 0 +#define LIBAVUTIL_VERSION_MICRO 1 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ @@ -108,6 +108,9 @@ #ifndef FF_API_XVMC #define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 54) #endif +#ifndef FF_API_OPT_TYPE_METADATA +#define FF_API_OPT_TYPE_METADATA (LIBAVUTIL_VERSION_MAJOR < 54) +#endif /** * @} |