highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/mjpegdec: Check initializing Huffman tables

Browse Source 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
(cherry picked from commit d5ddfec6c3ce0ff743e3d67c42a1a59d3afe8e8c)
This commit is contained in:
Andreas Rheinhardt 2021-04-03 16:00:56 +02:00
parent 1f3735892b
commit 54dd729cee
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/mjpegdec.c
View File

@ -154,7 +154,8 @@ av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx)
if (ff_mjpeg_decode_dht(s)) { if (ff_mjpeg_decode_dht(s)) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"error using external huffman table, switching back to internal\n"); "error using external huffman table, switching back to internal\n");
init_default_huffman_tables(s); if ((ret = init_default_huffman_tables(s)) < 0)
return ret;
} }
} }
if (avctx->field_order == AV_FIELD_BB) { /* quicktime icefloe 019 */ if (avctx->field_order == AV_FIELD_BB) { /* quicktime icefloe 019 */