diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-21 17:02:30 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-21 17:02:30 -0300 |
| commit | 4de591e6fb7361bd417dcd9563672ed0ad8b361b (patch) | |
| tree | ff6b5c51a4891b49f61d53b88bdfb27cc6a89579 /libavformat/ffmdec.c | |
| parent | 423375d4f06ae7103e575a31c23e62e3ba440845 (diff) | |
| parent | 83548fe894cdb455cc127f754d09905b6d23c173 (diff) | |
| download | ffmpeg-4de591e6fb7361bd417dcd9563672ed0ad8b361b.tar.gz | |
Merge commit '83548fe894cdb455cc127f754d09905b6d23c173'
* commit '83548fe894cdb455cc127f754d09905b6d23c173':
lavf: fix usage of AVIOContext.seekable
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/ffmdec.c')
| -rw-r--r-- | libavformat/ffmdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c index f863bf7818..de6ac27252 100644 --- a/libavformat/ffmdec.c +++ b/libavformat/ffmdec.c @@ -300,7 +300,7 @@ static int ffm2_read_header(AVFormatContext *s) ffm->write_index = avio_rb64(pb); /* get also filesize */ - if (pb->seekable) { + if (pb->seekable & AVIO_SEEKABLE_NORMAL) { ffm->file_size = avio_size(pb); if (ffm->write_index && 0) adjust_write_index(s); @@ -559,7 +559,7 @@ static int ffm_read_header(AVFormatContext *s) } ffm->write_index = avio_rb64(pb); /* get also filesize */ - if (pb->seekable) { + if (pb->seekable & AVIO_SEEKABLE_NORMAL) { ffm->file_size = avio_size(pb); if (ffm->write_index && 0) adjust_write_index(s); |