diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-15 03:03:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-15 04:17:26 +0200 |
| commit | b34c7a56565c6ebac02c9daf95f06217bc52eed8 (patch) | |
| tree | d0fcfaad052ed59c2d5934b89b667d142da13536 | |
| parent | 3ee83f46058449913abeca7ba82e8e2909828209 (diff) | |
| download | ffmpeg-b34c7a56565c6ebac02c9daf95f06217bc52eed8.tar.gz | |
Revert "MJPEG: emulate EOI also on two consecutive SOI."
This causes Ticket463, fix will be in the next commits
This reverts commit 5e2ea138b7c4c7f3910837611338bb3b8b761045.
| -rw-r--r-- | libavcodec/mjpegdec.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index b2e063fb4b..2c6330bf95 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1447,10 +1447,6 @@ 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); |