[FFmpeg-cvslog] mjpegdec: stop using deprecated avcodec_set_dimensions
Anton Khirnov
git at videolan.org
Fri Nov 1 15:21:24 CET 2013
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sun Oct 27 10:02:26 2013 +0100| [2cd94ad5bff929d98eeb50aed46831b950421281] | committer: Anton Khirnov
mjpegdec: stop using deprecated avcodec_set_dimensions
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2cd94ad5bff929d98eeb50aed46831b950421281
---
libavcodec/mjpegdec.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index fdf7c87..dea195b 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -211,7 +211,7 @@ int ff_mjpeg_decode_dht(MJpegDecodeContext *s)
int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
{
- int len, nb_components, i, width, height, pix_fmt_id;
+ int len, nb_components, i, width, height, pix_fmt_id, ret;
/* XXX: verify len field validity */
len = get_bits(&s->gb, 16);
@@ -309,7 +309,9 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
height *= 2;
}
- avcodec_set_dimensions(s->avctx, width, height);
+ ret = ff_set_dimensions(s->avctx, width, height);
+ if (ret < 0)
+ return ret;
s->first_picture = 0;
}
More information about the ffmpeg-cvslog
mailing list