[FFmpeg-cvslog] avcodec/mvcdec: stop using deprecated avcodec_set_dimensions()
Paul B Mahol
git at videolan.org
Fri Nov 1 20:06:18 CET 2013
ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Fri Nov 1 19:03:32 2013 +0000| [0610d6e8ae609e2b4b96cc5881e4ee19d763d66d] | committer: Paul B Mahol
avcodec/mvcdec: stop using deprecated avcodec_set_dimensions()
Signed-off-by: Paul B Mahol <onemda at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0610d6e8ae609e2b4b96cc5881e4ee19d763d66d
---
libavcodec/mvcdec.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/libavcodec/mvcdec.c b/libavcodec/mvcdec.c
index 423c7c4..2cc7735 100644
--- a/libavcodec/mvcdec.c
+++ b/libavcodec/mvcdec.c
@@ -39,6 +39,7 @@ static av_cold int mvc_decode_init(AVCodecContext *avctx)
MvcContext *s = avctx->priv_data;
int width = avctx->width;
int height = avctx->height;
+ int ret;
if (avctx->codec_id == AV_CODEC_ID_MVC1) {
width += 3;
@@ -46,8 +47,8 @@ static av_cold int mvc_decode_init(AVCodecContext *avctx)
}
width &= ~3;
height &= ~3;
- if (width != avctx->width || height != avctx->height)
- avcodec_set_dimensions(avctx, width, height);
+ if ((ret = ff_set_dimensions(avctx, width, height)) < 0)
+ return ret;
avctx->pix_fmt = (avctx->codec_id == AV_CODEC_ID_MVC1) ? AV_PIX_FMT_RGB555 : AV_PIX_FMT_BGRA;
s->frame = av_frame_alloc();
More information about the ffmpeg-cvslog
mailing list