diff options
| author | Anton Khirnov <anton@khirnov.net> | 2016-09-27 16:26:37 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2016-09-30 16:54:33 +0200 |
| commit | 83548fe894cdb455cc127f754d09905b6d23c173 (patch) | |
| tree | 87d466a0d6b205a99ee046e44ab155a8e082f28c /libavformat/avidec.c | |
| parent | 8d1267932ca9c2e343ef303349101bab6681d02e (diff) | |
| download | ffmpeg-streaming-83548fe894cdb455cc127f754d09905b6d23c173.zip ffmpeg-streaming-83548fe894cdb455cc127f754d09905b6d23c173.tar.gz | |
lavf: fix usage of AVIOContext.seekable
It is supposed to be a flag. The only currently defined value is
AVIO_SEEKABLE_NORMAL, but other ones may be added in the future.
However all the current lavf code treats this field as a bool (mainly
for historical reasons).
Change all those cases to properly check for AVIO_SEEKABLE_NORMAL.
Diffstat (limited to 'libavformat/avidec.c')
| -rw-r--r-- | libavformat/avidec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 3666b57..ddc7c2b 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -761,7 +761,8 @@ static int avi_read_header(AVFormatContext *s) break; case MKTAG('i', 'n', 'd', 'x'): pos = avio_tell(pb); - if (pb->seekable && !(s->flags & AVFMT_FLAG_IGNIDX) && + if ((pb->seekable & AVIO_SEEKABLE_NORMAL) && + !(s->flags & AVFMT_FLAG_IGNIDX) && read_braindead_odml_indx(s, 0) < 0 && (s->error_recognition & AV_EF_EXPLODE)) goto fail; @@ -828,7 +829,7 @@ fail: return AVERROR_INVALIDDATA; } - if (!avi->index_loaded && pb->seekable) + if (!avi->index_loaded && (pb->seekable & AVIO_SEEKABLE_NORMAL)) avi_load_index(s); avi->index_loaded = 1; |
