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:38:03 +0100 |
| commit | d81ccf1fb22958041e71d9e6d562a77fb7579d96 (patch) | |
| tree | 263f05958befde157451007ce1a9987965023134 | |
| parent | 67d20495f592e120b596dcacf14a7193de2dfb8f (diff) | |
| download | ffmpeg-d81ccf1fb22958041e71d9e6d562a77fb7579d96.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 1a0b49b144..eaf2659e63 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1799,7 +1799,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; } |