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/aiffdec.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/aiffdec.c')
| -rw-r--r-- | libavformat/aiffdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index 3bbe4a07bd..7dcc85f1ed 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -288,9 +288,9 @@ static int aiff_read_header(AVFormatContext *s) offset = avio_rb32(pb); /* Offset of sound data */ avio_rb32(pb); /* BlockSize... don't care */ offset += avio_tell(pb); /* Compute absolute data offset */ - if (st->codecpar->block_align && !pb->seekable) /* Assume COMM already parsed */ + if (st->codecpar->block_align && !(pb->seekable & AVIO_SEEKABLE_NORMAL)) /* Assume COMM already parsed */ goto got_sound; - if (!pb->seekable) { + if (!(pb->seekable & AVIO_SEEKABLE_NORMAL)) { av_log(s, AV_LOG_ERROR, "file is not seekable\n"); return -1; } |