Browse Source

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 d5ddfec6c3)
tags/n4.4
Andreas Rheinhardt 4 years ago
parent
commit
54dd729cee
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      libavcodec/mjpegdec.c

+ 2
- 1
libavcodec/mjpegdec.c View File

@@ -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 */


Loading…
Cancel
Save