diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-08-27 14:37:14 +0200 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-09-01 22:54:35 +0200 |
| commit | 5e2ea138b7c4c7f3910837611338bb3b8b761045 (patch) | |
| tree | 9530c483cb085b5f9c846f77128fabf1a9440fd3 /libavcodec | |
| parent | 55a1fe7a803027ebb202f790c5b77b0e1de6af5d (diff) | |
MJPEG: emulate EOI also on two consecutive SOI.
Fixes issue #362.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mjpegdec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index da0c5a959d..eac30e6e2d 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -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); |