This reverts commit fb5e2d71127ccae19c3f80ec363bb67d1871cb74.
---
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 */
--
2.17.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
