# HG changeset patch
# User cehoyos
# Date 1254778616 0
# Node ID 73615b2474387164ac3b5e177ee8fb2e8dcedde3
# Parent  79be5a6fd62f0591b42e2af9449607390f7f4206
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

diff -r 79be5a6fd62f -r 73615b247438 mp3.c
--- 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)