diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-16 23:06:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-16 23:09:12 +0200 |
| commit | b6c04b682176e72125b747b5982bcc4dea1f34c5 (patch) | |
| tree | b62c39bb1445b829f19d7ef44d4d95727f716b4a /libavcodec/mjpegdec.c | |
| parent | 93869d4e4447fa68d46c2c555295bdc8ed32cc51 (diff) | |
| download | ffmpeg-b6c04b682176e72125b747b5982bcc4dea1f34c5.tar.gz | |
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 <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 6 |
1 files changed, 0 insertions, 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); |