Commit 0f6c1d6d authored by Anton Khirnov's avatar Anton Khirnov

lavc/utils: stop using deprecated avcodec_set_dimensions

parent ce6949d3
...@@ -934,15 +934,17 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code ...@@ -934,15 +934,17 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
goto free_and_end; goto free_and_end;
if (avctx->coded_width && avctx->coded_height && !avctx->width && !avctx->height) if (avctx->coded_width && avctx->coded_height && !avctx->width && !avctx->height)
avcodec_set_dimensions(avctx, avctx->coded_width, avctx->coded_height); ret = ff_set_dimensions(avctx, avctx->coded_width, avctx->coded_height);
else if (avctx->width && avctx->height) else if (avctx->width && avctx->height)
avcodec_set_dimensions(avctx, avctx->width, avctx->height); ret = ff_set_dimensions(avctx, avctx->width, avctx->height);
if (ret < 0)
goto free_and_end;
if ((avctx->coded_width || avctx->coded_height || avctx->width || avctx->height) if ((avctx->coded_width || avctx->coded_height || avctx->width || avctx->height)
&& ( av_image_check_size(avctx->coded_width, avctx->coded_height, 0, avctx) < 0 && ( av_image_check_size(avctx->coded_width, avctx->coded_height, 0, avctx) < 0
|| av_image_check_size(avctx->width, avctx->height, 0, avctx) < 0)) { || av_image_check_size(avctx->width, avctx->height, 0, avctx) < 0)) {
av_log(avctx, AV_LOG_WARNING, "ignoring invalid width/height values\n"); av_log(avctx, AV_LOG_WARNING, "ignoring invalid width/height values\n");
avcodec_set_dimensions(avctx, 0, 0); ff_set_dimensions(avctx, 0, 0);
} }
/* if the decoder init function was already called previously, /* if the decoder init function was already called previously,
...@@ -1334,7 +1336,7 @@ int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size, ...@@ -1334,7 +1336,7 @@ int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size,
static int apply_param_change(AVCodecContext *avctx, AVPacket *avpkt) static int apply_param_change(AVCodecContext *avctx, AVPacket *avpkt)
{ {
int size = 0; int size = 0, ret;
const uint8_t *data; const uint8_t *data;
uint32_t flags; uint32_t flags;
...@@ -1377,8 +1379,10 @@ static int apply_param_change(AVCodecContext *avctx, AVPacket *avpkt) ...@@ -1377,8 +1379,10 @@ static int apply_param_change(AVCodecContext *avctx, AVPacket *avpkt)
goto fail; goto fail;
avctx->width = bytestream_get_le32(&data); avctx->width = bytestream_get_le32(&data);
avctx->height = bytestream_get_le32(&data); avctx->height = bytestream_get_le32(&data);
avcodec_set_dimensions(avctx, avctx->width, avctx->height);
size -= 8; size -= 8;
ret = ff_set_dimensions(avctx, avctx->width, avctx->height);
if (ret < 0)
return ret;
} }
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment