diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-04-03 16:00:56 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-04-03 18:08:02 +0200 |
| commit | 54dd729cee280b9c865986e3c19ebfeff98a4398 (patch) | |
| tree | 6364342f32d6826162af81f59cad5beb1d8f5b1b | |
| parent | 1f3735892bb3aed3684333ae237b680fcf480fca (diff) | |
| download | ffmpeg-54dd729cee280b9c865986e3c19ebfeff98a4398.tar.gz | |
avcodec/mjpegdec: Check initializing Huffman tables
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
(cherry picked from commit d5ddfec6c3ce0ff743e3d67c42a1a59d3afe8e8c)
| -rw-r--r-- | libavcodec/mjpegdec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index fd6a4eeb76..e4e0c26df9 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -154,7 +154,8 @@ av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx) if (ff_mjpeg_decode_dht(s)) { av_log(avctx, AV_LOG_ERROR, "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 */ |