From c6b8a7dbb4b624d0e46e05131d605266fd932aca Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 27 Oct 2013 10:02:26 +0100 Subject: eamad: stop using deprecated avcodec_set_dimensions --- libavcodec/eamad.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c index 8d6aa626a1..5de28c72da 100644 --- a/libavcodec/eamad.c +++ b/libavcodec/eamad.c @@ -250,10 +250,9 @@ static int decode_frame(AVCodecContext *avctx, buf += 16; if (avctx->width != width || avctx->height != height) { - if (av_image_check_size(width, height, 0, avctx) < 0) - return -1; - avcodec_set_dimensions(avctx, width, height); av_frame_unref(&s->last_frame); + if ((ret = ff_set_dimensions(avctx, width, height)) < 0) + return ret; } if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0) { -- cgit v1.2.3 From 06e7a20244453a53db9b83d798b116a9a9f64bdc Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 27 Oct 2013 10:02:26 +0100 Subject: eatgq: stop using deprecated avcodec_set_dimensions --- libavcodec/eatgq.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/eatgq.c b/libavcodec/eatgq.c index 0a3e0f6075..1ead5f7adc 100644 --- a/libavcodec/eatgq.c +++ b/libavcodec/eatgq.c @@ -216,9 +216,10 @@ static int tgq_decode_frame(AVCodecContext *avctx, s->height = bytestream2_get_le16u(&s->gb); } - if (s->avctx->width!=s->width || s->avctx->height!=s->height) { - avcodec_set_dimensions(s->avctx, s->width, s->height); - } + ret = ff_set_dimensions(s->avctx, s->width, s->height); + if (ret < 0) + return ret; + tgq_calculate_qtable(s, bytestream2_get_byteu(&s->gb)); bytestream2_skip(&s->gb, 3); -- cgit v1.2.3 From a87739388da6d00a757885428d42554e7eabf453 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 27 Oct 2013 10:02:26 +0100 Subject: eatgv: stop using deprecated avcodec_set_dimensions --- libavcodec/eatgv.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/eatgv.c b/libavcodec/eatgv.c index fabc5167bb..92d914ef54 100644 --- a/libavcodec/eatgv.c +++ b/libavcodec/eatgv.c @@ -269,9 +269,10 @@ static int tgv_decode_frame(AVCodecContext *avctx, s->width = AV_RL16(&buf[0]); s->height = AV_RL16(&buf[2]); if (s->avctx->width != s->width || s->avctx->height != s->height) { - avcodec_set_dimensions(s->avctx, s->width, s->height); av_freep(&s->frame_buffer); av_frame_unref(&s->last_frame); + if ((ret = ff_set_dimensions(s->avctx, s->width, s->height)) < 0) + return ret; } pal_count = AV_RL16(&buf[6]); @@ -282,9 +283,6 @@ static int tgv_decode_frame(AVCodecContext *avctx, } } - if ((ret = av_image_check_size(s->width, s->height, 0, avctx)) < 0) - return ret; - if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0) return ret; -- cgit v1.2.3 From ec7063005ee67c0b4d4b83aa5118dd22ad1094e8 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 27 Oct 2013 10:02:26 +0100 Subject: eatqi: stop using deprecated avcodec_set_dimensions --- libavcodec/eatqi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/eatqi.c b/libavcodec/eatqi.c index 9f7ec4d743..2345cc7bef 100644 --- a/libavcodec/eatqi.c +++ b/libavcodec/eatqi.c @@ -111,8 +111,9 @@ static int tqi_decode_frame(AVCodecContext *avctx, tqi_calculate_qtable(s, buf[4]); buf += 8; - if (s->avctx->width!=s->width || s->avctx->height!=s->height) - avcodec_set_dimensions(s->avctx, s->width, s->height); + ret = ff_set_dimensions(s->avctx, s->width, s->height); + if (ret < 0) + return ret; if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); -- cgit v1.2.3