From 83dc8f044d66379166fce96d604c8be7640cbbcd Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 19 Jan 2014 04:56:13 +0100 Subject: [PATCH] avcodec/mjpegdec: only run EOI emulation code when there was a scan Signed-off-by: Michael Niedermayer (cherry picked from commit 361e27a3d8096baacc45d2551a1ebfcbfdaa6a67) --- libavcodec/mjpegdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 361f2992c1..b168bd9320 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1953,7 +1953,7 @@ eoi_parser: "marker parser used %d bytes (%d bits)\n", (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; }