Merge commit '619a433eca2c5655c41b799e0b06380020fb1498'

* commit '619a433eca2c5655c41b799e0b06380020fb1498':
  lavu: Drop deprecated option type

Merged-by: James Almer <jamrial@gmail.com>

diff --git a/libavutil/opt.h b/libavutil/opt.h
index 0d893795deec9e3076167410878fe1da9573fb73..555929dd6b130796573fac55f9ea660aaba310b5 100644 (file)
--- 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 def7153f31786b1aaf72e60a4aa00b4180a73da5..2aa89914be97abfb69acf5d332e8c19012315f63 100644 (file)
--- 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