ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Mon Oct 23 16:28:38 2017 -0300| [5a2e581879b8901b8660b82ff8d333d18fc629ff] | committer: James Almer
Merge commit '4476027d93680cd88d2f75ef1cef5b0c276a8704' * commit '4476027d93680cd88d2f75ef1cef5b0c276a8704': lavc: Drop deprecated avctx codec name Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a2e581879b8901b8660b82ff8d333d18fc629ff --- libavcodec/avcodec.h | 7 ------- libavcodec/version.h | 3 --- 2 files changed, 10 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 1f76833f0e..9448075af2 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1507,13 +1507,6 @@ typedef struct AVCodecContext { enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */ const struct AVCodec *codec; -#if FF_API_CODEC_NAME - /** - * @deprecated this field is not used for anything in libavcodec - */ - attribute_deprecated - char codec_name[32]; -#endif enum AVCodecID codec_id; /* see AV_CODEC_ID_xxx */ /** diff --git a/libavcodec/version.h b/libavcodec/version.h index e0be3d5021..3ad0db30ca 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -57,9 +57,6 @@ #ifndef FF_API_DEBUG_MV #define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 58) #endif -#ifndef FF_API_CODEC_NAME -#define FF_API_CODEC_NAME (LIBAVCODEC_VERSION_MAJOR < 58) -#endif #ifndef FF_API_AFD #define FF_API_AFD (LIBAVCODEC_VERSION_MAJOR < 58) #endif ====================================================================== diff --cc libavcodec/version.h index e0be3d5021,99aa9bf8cc..3ad0db30ca --- a/libavcodec/version.h +++ b/libavcodec/version.h @@@ -45,21 -45,8 +45,18 @@@ * FF_API_* defines may be placed below to indicate public API that will be * dropped at a future version bump. The defines themselves are not part of * the public API and may change, break or disappear at any time. + * + * @note, when bumping the major version it is recommended to manually + * disable each FF_API_* in its own commit instead of disabling them all + * at once through the bump. This improves the git bisect-ability of the change. */ +#ifndef FF_API_LOWRES +#define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 59) +#endif +#ifndef FF_API_DEBUG_MV +#define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 58) +#endif - #ifndef FF_API_CODEC_NAME - #define FF_API_CODEC_NAME (LIBAVCODEC_VERSION_MAJOR < 58) - #endif #ifndef FF_API_AFD #define FF_API_AFD (LIBAVCODEC_VERSION_MAJOR < 58) #endif _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
