mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Only read ID3v1 tag if ID3v2 isn't present or is empty.
This prevents the demuxer from exporting multiple semantically identical but differently named tags. Patch by Anton Khirnov, wyskas gmail Originally committed as revision 20175 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
9a9964c50e
commit
7fd5aeb3e5
@ -142,8 +142,9 @@ static int mp3_read_header(AVFormatContext *s,
|
||||
st->need_parsing = AVSTREAM_PARSE_FULL;
|
||||
st->start_time = 0;
|
||||
|
||||
ff_id3v1_read(s);
|
||||
ff_id3v2_read(s);
|
||||
if (!av_metadata_get(s->metadata, "", NULL, AV_METADATA_IGNORE_SUFFIX))
|
||||
ff_id3v1_read(s);
|
||||
|
||||
off = url_ftell(s->pb);
|
||||
if (mp3_parse_vbr_tags(s, st, off) < 0)
|
||||
|
Loading…
Reference in New Issue
Block a user