ffmpeg | branch: master | Vittorio Giovara <vittorio.giov...@gmail.com> | Mon Dec 5 17:22:49 2016 -0500| [619a433eca2c5655c41b799e0b06380020fb1498] | committer: Vittorio Giovara
lavu: Drop deprecated option type Deprecated in 02/2014. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=619a433eca2c5655c41b799e0b06380020fb1498 --- libavutil/opt.h | 3 --- libavutil/version.h | 3 --- 2 files changed, 6 deletions(-) diff --git a/libavutil/opt.h b/libavutil/opt.h index a65c4f41ba..b68a396da7 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 3b2280cecd..d11e8d10f2 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 _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
