From b6c04b682176e72125b747b5982bcc4dea1f34c5 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 16 Sep 2011 23:06:47 +0200 Subject: [PATCH] mjpegdec: Remove buggy avid hacks, they dont do anything good with any file i found Fix multi plane jpeg Fixes ticket471 Signed-off-by: Michael Niedermayer --- libavcodec/mjpegdec.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 4a5b04672d..c44a0ee1c8 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1490,8 +1490,6 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, return -1; break; case EOI: - if ((s->buggy_avid && !s->interlaced) || s->restart_interval) - break; eoi_parser: s->cur_scan = 0; if (!s->got_picture) { @@ -1526,10 +1524,6 @@ eoi_parser: if (ff_mjpeg_decode_sos(s, NULL, NULL) < 0 && avctx->error_recognition >= FF_ER_EXPLODE) return AVERROR_INVALIDDATA; - /* buggy avid puts EOI every 10-20th frame */ - /* if restart period is over process EOI */ - if ((s->buggy_avid && !s->interlaced) || s->restart_interval) - goto eoi_parser; break; case DRI: mjpeg_decode_dri(s); -- 2.11.0