diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-21 23:59:53 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-21 23:59:53 -0300 |
| commit | 90000f15ec41fbb768b6b3d360131638d089bd59 (patch) | |
| tree | 430d2dff911d6567bf42803f681cb8bdc7adbd4c /libavcodec | |
| parent | 898349d702064906e9b4830999465a1a381afcfb (diff) | |
| parent | 6dca24cd1d570b806b5a3fdaef9d3c8608942a81 (diff) | |
Merge commit '6dca24cd1d570b806b5a3fdaef9d3c8608942a81'
* commit '6dca24cd1d570b806b5a3fdaef9d3c8608942a81':
lavc: Drop deprecated way of setting codec dimensions
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 8 | ||||
| -rw-r--r-- | libavcodec/utils.c | 10 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 0 insertions, 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 |