Commit b6c04b68 authored by Michael Niedermayer's avatar Michael Niedermayer

mjpegdec: Remove buggy avid hacks, they dont do anything good with any file i found

Fix multi plane jpeg
Fixes ticket471
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 93869d4e
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment