If the end of the input buffer is reached while decoding MJPEG and at least

a valid SOF was found, emulate an EOI.
This allows e.g. to at least decode the available part of incomplete MJPEG frames.

Originally committed as revision 19344 to svn://svn.ffmpeg.org/ffmpeg/trunk
release/0.6
Reimar Döffinger 16 years ago
parent 1496b04c28
commit 82c9182fe3
  1. 4
      libavcodec/mjpegdec.c

@ -1479,6 +1479,10 @@ not_the_end:
} }
} }
} }
if (s->got_picture) {
av_log(avctx, AV_LOG_WARNING, "EOI missing, emulating\n");
goto eoi_parser;
}
av_log(avctx, AV_LOG_FATAL, "No JPEG data found in image\n"); av_log(avctx, AV_LOG_FATAL, "No JPEG data found in image\n");
return -1; return -1;
the_end: the_end:

Loading…
Cancel
Save