Merge commit '83548fe894'
* commit '83548fe894':
lavf: fix usage of AVIOContext.seekable
Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
commit
4de591e6fb
65 changed files with 134 additions and 130 deletions
|
|
@ -89,7 +89,7 @@ static int adts_aac_read_header(AVFormatContext *s)
|
|||
st->need_parsing = AVSTREAM_PARSE_FULL_RAW;
|
||||
|
||||
ff_id3v1_read(s);
|
||||
if (s->pb->seekable &&
|
||||
if ((s->pb->seekable & AVIO_SEEKABLE_NORMAL) &&
|
||||
!av_dict_get(s->metadata, "", NULL, AV_DICT_IGNORE_SUFFIX)) {
|
||||
int64_t cur = avio_tell(s->pb);
|
||||
ff_ape_parse_tag(s);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue