Mercurial > libavformat.hg

diff mp3.c @ 5266:73615b247438 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author cehoyos
date Mon, 05 Oct 2009 21:36:56 +0000
parents 79be5a6fd62f
children fb4f4b61c8ce
line wrap: on
line diff
--- a/mp3.c	Mon Oct 05 20:10:07 2009 +0000
+++ b/mp3.c	Mon Oct 05 21:36:56 2009 +0000
@@ -142,8 +142,9 @@
     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)