[FFmpeg-cvslog] Merge commit '619a433eca2c5655c41b799e0b06380020fb1498'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Mon Oct 23 18:18:00 2017 -0300| [c0cfc0ce11c14285299838d2c1e96159bf9cb9de] | committer: James Almer

Merge commit '619a433eca2c5655c41b799e0b06380020fb1498'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c0cfc0ce11c14285299838d2c1e96159bf9cb9de
---

 libavutil/opt.h     | 3 ---
 libavutil/version.h | 3 ---
 2 files changed, 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


======================================================================