From 7fd5aeb3e57389198681a8ab2d5cd5d83a0c5a5f Mon Sep 17 00:00:00 2001
From: Anton Khirnov <wyskas@gmail.com>
Date: Mon, 5 Oct 2009 21:36:56 +0000
Subject: [PATCH] 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
---
 libavformat/mp3.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/mp3.c b/libavformat/mp3.c
index cad13cfe6a..5b5e06d04f 100644
--- a/libavformat/mp3.c
+++ b/libavformat/mp3.c
@@ -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)