diff options
| author | Dustin Brody <libav@parsoma.net> | 2012-01-18 04:16:42 -0500 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-01-20 09:30:09 +0100 |
| commit | b89f8774f2778c5aad4633a98e3a12597344730a (patch) | |
| tree | b5242a9228f9b4092c1cf2c4c2621d27a9dec397 /libavformat/avidec.c | |
| parent | 8e1340abc316e038bb89e5a3b46e92ff58c98a88 (diff) | |
| download | ffmpeg-b89f8774f2778c5aad4633a98e3a12597344730a.tar.gz | |
avidec: migrate last of lavf from FF_ER_* to AV_EF_*
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavformat/avidec.c')
| -rw-r--r-- | libavformat/avidec.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index b45224f641..b4ccfb50f8 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -666,9 +666,9 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) case MKTAG('i', 'n', 'd', 'x'): i= avio_tell(pb); 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; - } avio_seek(pb, i+size, SEEK_SET); break; case MKTAG('v', 'p', 'r', 'p'): @@ -705,7 +705,8 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) if(size > 1000000){ av_log(s, AV_LOG_ERROR, "Something went wrong during header parsing, " "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_end = avio_size(pb); goto end_of_header; |