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/utils.c | |
parent | 898349d702064906e9b4830999465a1a381afcfb (diff) | |
parent | 6dca24cd1d570b806b5a3fdaef9d3c8608942a81 (diff) | |
download | ffmpeg-90000f15ec41fbb768b6b3d360131638d089bd59.tar.gz |
Merge commit '6dca24cd1d570b806b5a3fdaef9d3c8608942a81'
* commit '6dca24cd1d570b806b5a3fdaef9d3c8608942a81':
lavc: Drop deprecated way of setting codec dimensions
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/utils.c')
-rw-r--r-- | libavcodec/utils.c | 10 |
1 files changed, 0 insertions, 10 deletions
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); |