From b34c7a56565c6ebac02c9daf95f06217bc52eed8 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 15 Sep 2011 03:03:33 +0200 Subject: [PATCH] Revert "MJPEG: emulate EOI also on two consecutive SOI." This causes Ticket463, fix will be in the next commits This reverts commit 5e2ea138b7c4c7f3910837611338bb3b8b761045. --- libavcodec/mjpegdec.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index b2e063fb4b..2c6330bf95 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1447,10 +1447,6 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, s->restart_count = 0; /* nothing to do on SOI */ - if (s->got_picture) { - av_log(avctx, AV_LOG_WARNING, "EOI missing, emulating\n"); - goto eoi_parser; - } break; case DQT: ff_mjpeg_decode_dqt(s);