diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-21 01:33:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-21 01:33:31 +0100 |
| commit | 8f0768cc22788357f603695b86f5e9013652bba6 (patch) | |
| tree | aece6cab293d489b857d02d206d90e56ace4eade /libavformat/avidec.c | |
| parent | 01084336b7b969e29f163699a8414a84d00295da (diff) | |
| parent | 23e57d167a87d3a671fe25efb2d5a1cf1719efc6 (diff) | |
| download | ffmpeg-8f0768cc22788357f603695b86f5e9013652bba6.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Add a tool that uses avio to read and write, doing a plain copy of data
ARM: fix build with FFT enabled and MDCT disabled
lavf: force single-threaded decoding in avformat_find_stream_info
avidec: migrate last of lavf from FF_ER_* to AV_EF_*
avserver: fix build after the next bump.
Conflicts:
libavformat/Makefile
libavformat/avidec.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 76dda0f8f7..1740c9e047 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -724,8 +724,8 @@ 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) && avi->use_odml && - read_braindead_odml_indx(s, 0) < 0 && s->error_recognition >= FF_ER_EXPLODE){ - goto fail; } + read_braindead_odml_indx(s, 0) < 0 && s->error_recognition >= FF_ER_EXPLODE) + goto fail; avio_seek(pb, i+size, SEEK_SET); break; case MKTAG('v', 'p', 'r', 'p'): @@ -762,7 +762,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 = avi->fsize; goto end_of_header; |