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/aviobuf.c | |
| parent | 8d1267932ca9c2e343ef303349101bab6681d02e (diff) | |
| download | ffmpeg-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/aviobuf.c')
| -rw-r--r-- | libavformat/aviobuf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 706cf5dd7f..39a11e21c4 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -265,7 +265,7 @@ int64_t avio_seek(AVIOContext *s, int64_t offset, int whence) offset1 >= 0 && offset1 < (s->buf_end - s->buffer)) { /* can do the seek inside the buffer */ s->buf_ptr = s->buffer + offset1; - } else if ((!s->seekable || + } else if ((!(s->seekable & AVIO_SEEKABLE_NORMAL) || offset1 <= s->buf_end + SHORT_SEEK_THRESHOLD - s->buffer) && !s->write_flag && offset1 >= 0 && (whence != SEEK_END || force)) { |