Browse Source

lavc/mjpegdec: Do not skip reading quantization tables.

They may contain 0xFFs, confusing the start code finding algorithm.

Fixes ticket #5819.
(cherry picked from commit cef5bc0e6e)

Conflicts:
	libavcodec/mjpegdec.c
tags/n3.0.3
Carl Eugen Hoyos 9 years ago
parent
commit
17035c8d2e
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      libavcodec/mjpegdec.c

+ 3
- 3
libavcodec/mjpegdec.c View File

@@ -2104,6 +2104,9 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
/* Comment */
else if (start_code == COM)
mjpeg_decode_com(s);
else if (start_code == DQT) {
ff_mjpeg_decode_dqt(s);
}

ret = -1;

@@ -2135,9 +2138,6 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
s->restart_count = 0;
/* nothing to do on SOI */
break;
case DQT:
ff_mjpeg_decode_dqt(s);
break;
case DHT:
if ((ret = ff_mjpeg_decode_dht(s)) < 0) {
av_log(avctx, AV_LOG_ERROR, "huffman table decode error\n");


Loading…
Cancel
Save