From a18e04bcf989a9d7f5629c573f9d70f8a020c7a7 Mon Sep 17 00:00:00 2001 From: Dustin Brody Date: Thu, 25 Aug 2011 19:47:01 -0400 Subject: mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested Signed-off-by: Anton Khirnov --- libavcodec/mxpegdec.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'libavcodec/mxpegdec.c') diff --git a/libavcodec/mxpegdec.c b/libavcodec/mxpegdec.c index 92fd244ec7..fd3fef47a9 100644 --- a/libavcodec/mxpegdec.c +++ b/libavcodec/mxpegdec.c @@ -47,9 +47,7 @@ static av_cold int mxpeg_decode_init(AVCodecContext *avctx) s->picture[0].reference = s->picture[1].reference = 3; s->jpg.picture_ptr = &s->picture[0]; - ff_mjpeg_decode_init(avctx); - - return 0; + return ff_mjpeg_decode_init(avctx); } static int mxpeg_decode_app(MXpegDecodeContext *s, -- cgit v1.2.3