X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Favidec.c;h=567210097b1452e1fa75fb6c40597aa5ca1e26ba;hb=8ffc5f9e92eacc30b8552b3fdc7b7075a9998607;hp=4cf99bb6b9797b2b9373862f09b5130beb86c0e5;hpb=ea4b2b5e2cec92f7d9e1cded61f69b2d63d22e9c;p=ffmpeg diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 4cf99bb6b97..567210097b1 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -674,14 +674,6 @@ resync: for(i=sync=url_ftell(pb); !url_feof(pb); i++) { int j; - if (i >= avi->movi_end) { - if (avi->is_odml) { - url_fskip(pb, avi->riff_end - i); - avi->riff_end = avi->movi_end = url_fsize(pb); - } else - break; - } - for(j=0; j<7; j++) d[j]= d[j+1]; d[7]= get_byte(pb); @@ -701,7 +693,8 @@ resync: //parse ix## if( (d[0] == 'i' && d[1] == 'x' && n < s->nb_streams) //parse JUNK - ||(d[0] == 'J' && d[1] == 'U' && d[2] == 'N' && d[3] == 'K')){ + ||(d[0] == 'J' && d[1] == 'U' && d[2] == 'N' && d[3] == 'K') + ||(d[0] == 'i' && d[1] == 'd' && d[2] == 'x' && d[3] == '1')){ url_fskip(pb, size); //av_log(NULL, AV_LOG_DEBUG, "SKIP\n"); goto resync;