virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-20 07:48:15 +02:00
Code Issues Releases Activity

lavc/mjpegdec: Do not skip reading quantization tables.

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

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

Conflicts:
	libavcodec/mjpegdec.c
This commit is contained in:
Carl Eugen Hoyos 2016-09-02 17:10:57 +02:00
parent 426b959e37
commit 17035c8d2e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/mjpegdec.c
View File

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