diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-10-27 10:02:26 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-10-31 20:14:16 +0100 |
| commit | 2e0ab4d314b1ef0c5eb3d8987ce2be4e86cb535f (patch) | |
| tree | e044954828b53f55d7259c271b64b69f4b67eb74 | |
| parent | b53febc1c0da9729d7b55148c0097985d83e4cc4 (diff) | |
| download | ffmpeg-2e0ab4d314b1ef0c5eb3d8987ce2be4e86cb535f.tar.gz | |
vp56: stop using deprecated avcodec_set_dimensions
| -rw-r--r-- | libavcodec/vp5.c | 5 | ||||
| -rw-r--r-- | libavcodec/vp56.c | 4 | ||||
| -rw-r--r-- | 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) { |