diff --git a/libavutil/opt.h b/libavutil/opt.h index a65c4f41ba71a3e78c7d42679d5f2652d3754f22..b68a396da71437553c4a15cb646eafaa04006b25 100644 --- a/libavutil/opt.h +++ b/libavutil/opt.h @@ -263,9 +263,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 3b2280cecd562f83bd696e75c91c1b146911b319..d11e8d10f2980792be8ff5f83afef781de2d51dd 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -78,9 +78,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