MJPEG: emulate EOI also on two consecutive SOI.
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>
Sat, 27 Aug 2011 12:37:14 +0000 (14:37 +0200)
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>
Thu, 1 Sep 2011 20:54:35 +0000 (22:54 +0200)
Fixes issue #362.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
libavcodec/mjpegdec.c

index da0c5a9..eac30e6 100644 (file)
@@ -1442,6 +1442,10 @@ 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);