RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested 

Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Dustin Brody 2011-08-25 19:47:01 -04:00 committed by Anton Khirnov
parent 7485e54708
commit a18e04bcf9
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mjpegdec.c
View File

@ -101,8 +101,8 @@ av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx)
av_log(avctx, AV_LOG_INFO, "mjpeg: using external huffman table\n"); av_log(avctx, AV_LOG_INFO, "mjpeg: using external huffman table\n");
init_get_bits(&s->gb, avctx->extradata, avctx->extradata_size*8); init_get_bits(&s->gb, avctx->extradata, avctx->extradata_size*8);
if (ff_mjpeg_decode_dht(s)) { if (ff_mjpeg_decode_dht(s)) {
av_log(avctx, AV_LOG_ERROR, "mjpeg: error using external huffman table, switching back to internal\n"); av_log(avctx, AV_LOG_ERROR, "mjpeg: error using external huffman table\n");
build_basic_mjpeg_vlc(s); return AVERROR_INVALIDDATA;
} }
} }
if (avctx->extradata_size > 9 && if (avctx->extradata_size > 9 &&

4
libavcodec/mxpegdec.c
View File

@ -47,9 +47,7 @@ static av_cold int mxpeg_decode_init(AVCodecContext *avctx)
s->picture[0].reference = s->picture[1].reference = 3; s->picture[0].reference = s->picture[1].reference = 3;
s->jpg.picture_ptr = &s->picture[0]; s->jpg.picture_ptr = &s->picture[0];
ff_mjpeg_decode_init(avctx); return ff_mjpeg_decode_init(avctx);
return 0;
} }
static int mxpeg_decode_app(MXpegDecodeContext *s, static int mxpeg_decode_app(MXpegDecodeContext *s,