From db92e4ea8daad70515169f4d98afef291f66c57f Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 27 Oct 2013 10:02:26 +0100 Subject: truemotion1: stop using deprecated avcodec_set_dimensions --- libavcodec/truemotion1.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/truemotion1.c b/libavcodec/truemotion1.c index c1e086366e..f7be92fb43 100644 --- a/libavcodec/truemotion1.c +++ b/libavcodec/truemotion1.c @@ -397,15 +397,16 @@ static int truemotion1_decode_header(TrueMotion1Context *s) new_pix_fmt = AV_PIX_FMT_RGB555; // RGB565 is supported as well s->w >>= width_shift; - if ((ret = av_image_check_size(s->w, s->h, 0, s->avctx)) < 0) - return ret; if (s->w != s->avctx->width || s->h != s->avctx->height || new_pix_fmt != s->avctx->pix_fmt) { av_frame_unref(&s->frame); s->avctx->sample_aspect_ratio = (AVRational){ 1 << width_shift, 1 }; s->avctx->pix_fmt = new_pix_fmt; - avcodec_set_dimensions(s->avctx, s->w, s->h); + + if ((ret = ff_set_dimensions(s->avctx, s->w, s->h)) < 0) + return ret; + av_fast_malloc(&s->vert_pred, &s->vert_pred_size, s->avctx->width * sizeof(unsigned int)); } -- cgit v1.2.3 From 3cfdb912cb5ba788b13999a02698a60a85c0828b Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 27 Oct 2013 10:02:26 +0100 Subject: txd: stop using deprecated avcodec_set_dimensions --- libavcodec/txd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/txd.c b/libavcodec/txd.c index 0eca07f76c..8f12291c85 100644 --- a/libavcodec/txd.c +++ b/libavcodec/txd.c @@ -63,10 +63,9 @@ static int txd_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, return AVERROR_PATCHWELCOME; } - if ((ret = av_image_check_size(w, h, 0, avctx)) < 0) + if ((ret = ff_set_dimensions(avctx, w, h)) < 0) return ret; - if (w != avctx->width || h != avctx->height) - avcodec_set_dimensions(avctx, w, h); + if ((ret = ff_get_buffer(avctx, p, 0)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; -- cgit v1.2.3 From b53febc1c0da9729d7b55148c0097985d83e4cc4 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 27 Oct 2013 10:02:26 +0100 Subject: vp3: stop using deprecated avcodec_set_dimensions --- libavcodec/vp3.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 467dfd5655..d596816066 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2166,6 +2166,7 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb) Vp3DecodeContext *s = avctx->priv_data; int visible_width, visible_height, colorspace; int offset_x = 0, offset_y = 0; + int ret; AVRational fps, aspect; s->theora = get_bits_long(gb, 24); @@ -2182,12 +2183,6 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb) visible_width = s->width = get_bits(gb, 16) << 4; visible_height = s->height = get_bits(gb, 16) << 4; - if(av_image_check_size(s->width, s->height, 0, avctx)){ - av_log(avctx, AV_LOG_ERROR, "Invalid dimensions (%dx%d)\n", s->width, s->height); - s->width= s->height= 0; - return -1; - } - if (s->theora >= 0x030200) { visible_width = get_bits_long(gb, 24); visible_height = get_bits_long(gb, 24); @@ -2234,9 +2229,11 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb) if ( visible_width <= s->width && visible_width > s->width-16 && visible_height <= s->height && visible_height > s->height-16 && !offset_x && (offset_y == s->height - visible_height)) - avcodec_set_dimensions(avctx, visible_width, visible_height); + ret = ff_set_dimensions(avctx, visible_width, visible_height); else - avcodec_set_dimensions(avctx, s->width, s->height); + ret = ff_set_dimensions(avctx, s->width, s->height); + if (ret < 0) + return ret; if (colorspace == 1) { avctx->color_primaries = AVCOL_PRI_BT470M; -- cgit v1.2.3 From 2e0ab4d314b1ef0c5eb3d8987ce2be4e86cb535f Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 27 Oct 2013 10:02:26 +0100 Subject: vp56: stop using deprecated avcodec_set_dimensions --- libavcodec/vp5.c | 5 ++++- libavcodec/vp56.c | 4 ++-- libavcodec/vp6.c | 8 ++++++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c index f4d1c7feea..b60928241d 100644 --- a/libavcodec/vp5.c +++ b/libavcodec/vp5.c @@ -28,6 +28,7 @@ #include "avcodec.h" #include "get_bits.h" +#include "internal.h" #include "vp56.h" #include "vp56data.h" @@ -67,7 +68,9 @@ static int vp5_parse_header(VP56Context *s, const uint8_t *buf, int buf_size, if (!s->macroblocks || /* first frame */ 16*cols != s->avctx->coded_width || 16*rows != s->avctx->coded_height) { - avcodec_set_dimensions(s->avctx, 16*cols, 16*rows); + int ret = ff_set_dimensions(s->avctx, 16 * cols, 16 * rows); + if (ret < 0) + return ret; return VP56_SIZE_CHANGE; } } else if (!s->macroblocks) diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c index 35df0e0e1c..53a0271188 100644 --- a/libavcodec/vp56.c +++ b/libavcodec/vp56.c @@ -470,7 +470,7 @@ static int vp56_size_changed(AVCodecContext *avctx) s->mb_height = (avctx->coded_height+15) / 16; if (s->mb_width > 1000 || s->mb_height > 1000) { - avcodec_set_dimensions(avctx, 0, 0); + ff_set_dimensions(avctx, 0, 0); av_log(avctx, AV_LOG_ERROR, "picture too big\n"); return -1; } @@ -528,7 +528,7 @@ int ff_vp56_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, for (i = 0; i < 4; i++) av_frame_unref(s->frames[i]); if (is_alpha) { - avcodec_set_dimensions(avctx, 0, 0); + ff_set_dimensions(avctx, 0, 0); return -1; } } diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c index fddfc9d04b..d10a64001a 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -32,6 +32,7 @@ #include "avcodec.h" #include "get_bits.h" #include "huffman.h" +#include "internal.h" #include "vp56.h" #include "vp56data.h" @@ -93,7 +94,10 @@ static int vp6_parse_header(VP56Context *s, const uint8_t *buf, int buf_size, s->avctx->coded_width = 16 * cols; s->avctx->coded_height = 16 * rows; } else { - avcodec_set_dimensions(s->avctx, 16 * cols, 16 * rows); + int ret = ff_set_dimensions(s->avctx, 16 * cols, 16 * rows); + if (ret < 0) + return ret; + if (s->avctx->extradata_size == 1) { s->avctx->width -= s->avctx->extradata[0] >> 4; s->avctx->height -= s->avctx->extradata[0] & 0x0F; @@ -154,7 +158,7 @@ static int vp6_parse_header(VP56Context *s, const uint8_t *buf, int buf_size, buf_size -= coeff_offset; if (buf_size < 0) { if (s->frames[VP56_FRAME_CURRENT]->key_frame) - avcodec_set_dimensions(s->avctx, 0, 0); + ff_set_dimensions(s->avctx, 0, 0); return AVERROR_INVALIDDATA; } if (s->use_huffman) { -- cgit v1.2.3 From 757d5e8ef98ba2ab0dd0e85a46290c4f4a7e82be Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 27 Oct 2013 10:02:26 +0100 Subject: vp8: stop using deprecated avcodec_set_dimensions --- libavcodec/vp8.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 910ec209a4..b1b4f2d7ec 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -114,16 +114,15 @@ static void vp8_decode_flush(AVCodecContext *avctx) static int update_dimensions(VP8Context *s, int width, int height) { AVCodecContext *avctx = s->avctx; - int i; + int i, ret; if (width != s->avctx->width || height != s->avctx->height) { - if (av_image_check_size(width, height, 0, s->avctx)) - return AVERROR_INVALIDDATA; - vp8_decode_flush_impl(s->avctx, 1); - avcodec_set_dimensions(s->avctx, width, height); + ret = ff_set_dimensions(s->avctx, width, height); + if (ret < 0) + return ret; } s->mb_width = (s->avctx->coded_width +15) / 16; -- cgit v1.2.3