ffmpeg | branch: master | James Almer <[email protected]> | Sat Oct 21 23:59:53 2017 -0300| [90000f15ec41fbb768b6b3d360131638d089bd59] | committer: James Almer
Merge commit '6dca24cd1d570b806b5a3fdaef9d3c8608942a81' * commit '6dca24cd1d570b806b5a3fdaef9d3c8608942a81': lavc: Drop deprecated way of setting codec dimensions Merged-by: James Almer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=90000f15ec41fbb768b6b3d360131638d089bd59 --- libavcodec/avcodec.h | 8 -------- libavcodec/utils.c | 10 ---------- libavcodec/version.h | 3 --- 3 files changed, 21 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index e02445e383..40c8fab369 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -5638,14 +5638,6 @@ enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const en * @} */ -#if FF_API_SET_DIMENSIONS -/** - * @deprecated this function is not supposed to be used from outside of lavc - */ -attribute_deprecated -void avcodec_set_dimensions(AVCodecContext *s, int width, int height); -#endif - #if FF_API_TAG_STRING /** * Put a string representing the codec tag codec_tag in buf. diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 95786e8b54..05f4302ad1 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -198,16 +198,6 @@ unsigned avcodec_get_edge_width(void) } #endif -#if FF_API_SET_DIMENSIONS -void avcodec_set_dimensions(AVCodecContext *s, int width, int height) -{ - int ret = ff_set_dimensions(s, width, height); - if (ret < 0) { - av_log(s, AV_LOG_WARNING, "Failed to set dimensions %d %d\n", width, height); - } -} -#endif - int ff_set_dimensions(AVCodecContext *s, int width, int height) { int ret = av_image_check_size2(width, height, s->max_pixels, AV_PIX_FMT_NONE, 0, s); diff --git a/libavcodec/version.h b/libavcodec/version.h index 95be1ed4cd..fd334e83fd 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -54,9 +54,6 @@ #ifndef FF_API_LOWRES #define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_SET_DIMENSIONS -#define FF_API_SET_DIMENSIONS (LIBAVCODEC_VERSION_MAJOR < 58) -#endif #ifndef FF_API_DEBUG_MV #define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 58) #endif ====================================================================== diff --cc libavcodec/avcodec.h index e02445e383,11a3280eb8..40c8fab369 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@@ -5638,15 -4937,6 +5638,7 @@@ enum AVPixelFormat avcodec_default_get_ * @} */ - #if FF_API_SET_DIMENSIONS - /** - * @deprecated this function is not supposed to be used from outside of lavc - */ - attribute_deprecated - void avcodec_set_dimensions(AVCodecContext *s, int width, int height); - #endif - +#if FF_API_TAG_STRING /** * Put a string representing the codec tag codec_tag in buf. * diff --cc libavcodec/utils.c index 95786e8b54,6cef65083d..05f4302ad1 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@@ -198,19 -125,9 +198,9 @@@ unsigned avcodec_get_edge_width(void } #endif - #if FF_API_SET_DIMENSIONS - void avcodec_set_dimensions(AVCodecContext *s, int width, int height) - { - int ret = ff_set_dimensions(s, width, height); - if (ret < 0) { - av_log(s, AV_LOG_WARNING, "Failed to set dimensions %d %d\n", width, height); - } - } - #endif - int ff_set_dimensions(AVCodecContext *s, int width, int height) { - int ret = av_image_check_size(width, height, 0, s); + int ret = av_image_check_size2(width, height, s->max_pixels, AV_PIX_FMT_NONE, 0, s); if (ret < 0) width = height = 0; diff --cc libavcodec/version.h index 95be1ed4cd,a12c322f49..fd334e83fd --- a/libavcodec/version.h +++ b/libavcodec/version.h @@@ -45,18 -45,8 +45,15 @@@ * 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_SET_DIMENSIONS - #define FF_API_SET_DIMENSIONS (LIBAVCODEC_VERSION_MAJOR < 58) - #endif #ifndef FF_API_DEBUG_MV #define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 58) #endif _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
