RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This reverts commit fb5e2d7112.
This commit is contained in:
Michael Niedermayer 2021-05-02 14:44:00 +02:00
parent 4d3474432f
commit 4b1e1f706b
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/mjpegdec.c
View File

@ -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 */