Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

avidec: migrate last of lavf from FF_ER_* to AV_EF_*

Browse source 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Dustin Brody 2012-01-18 04:16:42 -05:00 • committed by Anton Khirnov
parent 8e1340abc3
commit b89f8774f2
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libavformat/avidec.c
View file

@ -666,9 +666,9 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
case MKTAG('i', 'n', 'd', 'x'): case MKTAG('i', 'n', 'd', 'x'):
i= avio_tell(pb); i= avio_tell(pb);
if(pb->seekable && !(s->flags & AVFMT_FLAG_IGNIDX) && if(pb->seekable && !(s->flags & AVFMT_FLAG_IGNIDX) &&
read_braindead_odml_indx(s, 0) < 0 && s->error_recognition >= FF_ER_EXPLODE){ read_braindead_odml_indx(s, 0) < 0 &&
(s->error_recognition & AV_EF_EXPLODE))
goto fail; goto fail;
}
avio_seek(pb, i+size, SEEK_SET); avio_seek(pb, i+size, SEEK_SET);
break; break;
case MKTAG('v', 'p', 'r', 'p'): case MKTAG('v', 'p', 'r', 'p'):
@ -705,7 +705,8 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
if(size > 1000000){ if(size > 1000000){
av_log(s, AV_LOG_ERROR, "Something went wrong during header parsing, " av_log(s, AV_LOG_ERROR, "Something went wrong during header parsing, "
"I will ignore it and try to continue anyway.\n"); "I will ignore it and try to continue anyway.\n");
if (s->error_recognition >= FF_ER_EXPLODE) goto fail; if (s->error_recognition & AV_EF_EXPLODE)
goto fail;
avi->movi_list = avio_tell(pb) - 4; avi->movi_list = avio_tell(pb) - 4;
avi->movi_end = avio_size(pb); avi->movi_end = avio_size(pb);
goto end_of_header; goto end_of_header;