diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-23 18:18:00 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-23 18:18:00 -0300 |
| commit | c0cfc0ce11c14285299838d2c1e96159bf9cb9de (patch) | |
| tree | 6f1a81656520ec4b3bc74057b98c490e01741de3 /libavutil | |
| parent | b773a8d8c1dfe4cfc6eabf509e26ab011270b9ed (diff) | |
| parent | 619a433eca2c5655c41b799e0b06380020fb1498 (diff) | |
| download | ffmpeg-c0cfc0ce11c14285299838d2c1e96159bf9cb9de.tar.gz | |
Merge commit '619a433eca2c5655c41b799e0b06380020fb1498'
* commit '619a433eca2c5655c41b799e0b06380020fb1498':
lavu: Drop deprecated option type
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/opt.h | 3 | ||||
| -rw-r--r-- | libavutil/version.h | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/libavutil/opt.h b/libavutil/opt.h index 0d893795de..555929dd6b 100644 --- a/libavutil/opt.h +++ b/libavutil/opt.h @@ -275,9 +275,6 @@ 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 def7153f31..2aa89914be 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -106,9 +106,6 @@ * @{ */ -#ifndef FF_API_OPT_TYPE_METADATA -#define FF_API_OPT_TYPE_METADATA (LIBAVUTIL_VERSION_MAJOR < 56) -#endif #ifndef FF_API_DLOG #define FF_API_DLOG (LIBAVUTIL_VERSION_MAJOR < 56) #endif |