avformat/demux: Avoid always-true branch
Since 9d037c54f2 id3v2_extra_meta
can only be != NULL if the input format wants ID3v2 tags to be
read generically.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
parent
e918e202e0
commit
e6c03711aa
1 changed files with 0 additions and 3 deletions
|
|
@ -325,15 +325,12 @@ int avformat_open_input(AVFormatContext **ps, const char *filename,
|
|||
}
|
||||
|
||||
if (id3v2_extra_meta) {
|
||||
if (is_id3v2_format(s->iformat)) {
|
||||
if ((ret = ff_id3v2_parse_apic(s, id3v2_extra_meta)) < 0)
|
||||
goto close;
|
||||
if ((ret = ff_id3v2_parse_chapters(s, id3v2_extra_meta)) < 0)
|
||||
goto close;
|
||||
if ((ret = ff_id3v2_parse_priv(s, id3v2_extra_meta)) < 0)
|
||||
goto close;
|
||||
} else
|
||||
av_log(s, AV_LOG_DEBUG, "demuxer does not support additional id3 data, skipping\n");
|
||||
ff_id3v2_free_extra_meta(&id3v2_extra_meta);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue