diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-19 04:56:13 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-01-19 14:56:18 +0100 |
| commit | 55a4228ac2ee1890c5c139e5af8cc1e980d31953 (patch) | |
| tree | c2ce858d1702d078db8aefb4a1c8b501a98d38ff | |
| parent | 3ae81880e1ea688e732f736f2008c6f3e4cfab18 (diff) | |
| download | ffmpeg-55a4228ac2ee1890c5c139e5af8cc1e980d31953.tar.gz | |
avcodec/mjpegdec: only run EOI emulation code when there was a scan
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 361e27a3d8096baacc45d2551a1ebfcbfdaa6a67)
| -rw-r--r-- | libavcodec/mjpegdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 78f63fec87..60a47f2379 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1811,7 +1811,7 @@ eoi_parser: (get_bits_count(&s->gb) + 7) / 8, get_bits_count(&s->gb)); } } - if (s->got_picture) { + if (s->got_picture && s->cur_scan) { av_log(avctx, AV_LOG_WARNING, "EOI missing, emulating\n"); goto eoi_parser; } |