avcodec/mjpegdec: only run EOI emulation code when there was a scan
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 19 Jan 2014 03:56:13 +0000 (04:56 +0100)
committerCarl Eugen Hoyos <cehoyos@ag.or.at>
Sun, 19 Jan 2014 13:38:03 +0000 (14:38 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 361e27a3d8096baacc45d2551a1ebfcbfdaa6a67)

libavcodec/mjpegdec.c

index 1a0b49b..eaf2659 100644 (file)
@@ -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;
     }