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/bintext.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/bintext.c')
| -rw-r--r-- | libavformat/bintext.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/bintext.c b/libavformat/bintext.c index a264fd1b5f..12e3bfde4d 100644 --- a/libavformat/bintext.c +++ b/libavformat/bintext.c @@ -141,7 +141,7 @@ static int bintext_read_header(AVFormatContext *s) st->codecpar->extradata[0] = 16; st->codecpar->extradata[1] = 0; - if (pb->seekable) { + if (pb->seekable & AVIO_SEEKABLE_NORMAL) { int got_width = 0; bin->fsize = avio_size(pb); if (ff_sauce_read(s, &bin->fsize, &got_width, 0) < 0) @@ -199,7 +199,7 @@ static int xbin_read_header(AVFormatContext *s) if (avio_read(pb, st->codecpar->extradata + 2, st->codecpar->extradata_size - 2) < 0) return AVERROR(EIO); - if (pb->seekable) { + if (pb->seekable & AVIO_SEEKABLE_NORMAL) { bin->fsize = avio_size(pb) - 9 - st->codecpar->extradata_size; ff_sauce_read(s, &bin->fsize, NULL, 0); avio_seek(pb, 9 + st->codecpar->extradata_size, SEEK_SET); @@ -237,7 +237,7 @@ static int adf_read_header(AVFormatContext *s) if (avio_read(pb, st->codecpar->extradata + 2 + 48, 4096) < 0) return AVERROR(EIO); - if (pb->seekable) { + if (pb->seekable & AVIO_SEEKABLE_NORMAL) { int got_width = 0; bin->fsize = avio_size(pb) - 1 - 192 - 4096; st->codecpar->width = 80<<3; @@ -271,7 +271,7 @@ static int idf_read_header(AVFormatContext *s) AVStream *st; int got_width = 0; - if (!pb->seekable) + if (!(pb->seekable & AVIO_SEEKABLE_NORMAL)) return AVERROR(EIO); st = init_stream(s); |