[FFmpeg-cvslog] Revert "avcodec/mjpegdec: fix SOF check in EOI"

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun May  2 14:44:00 2021 +0200| [4b1e1f706b15f1ed68e351c5924d28c15d2fc763] | committer: Michael Niedermayer

Revert "avcodec/mjpegdec: fix SOF check in EOI"

This reverts commit fb5e2d71127ccae19c3f80ec363bb67d1871cb74.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4b1e1f706b15f1ed68e351c5924d28c15d2fc763
---

 libavcodec/mjpegdec.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index c829172200..16aed078f6 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -2560,16 +2560,11 @@ eoi_parser:
                 s->progressive && s->cur_scan && s->got_picture)
                 mjpeg_idct_scan_progressive_ac(s);
             s->cur_scan = 0;
-            if (!s->seen_sof) {
+            if (!s->got_picture) {
                 av_log(avctx, AV_LOG_WARNING,
                        "Found EOI before any SOF, ignoring\n");
                 break;
             }
-            if (!s->got_picture && avctx->skip_frame != AVDISCARD_ALL) {
-                av_log(avctx, AV_LOG_WARNING,
-                       "Found EOI before any SOS, ignoring\n");
-                break;
-            }
             if (s->interlaced) {
                 s->bottom_field ^= 1;
                 /* if not bottom field, do not output image yet */