From 179502fe93532a3686c08f07d9ef6effaaf4f25a Mon Sep 17 00:00:00 2001
From: Thomas Jansen <mithi@mithi.net>
Date: Mon, 7 Dec 2009 14:52:48 +0100
Subject: decoder_api: prefer stream_tag over decoder_tag

If both tags (stream and decoder) are present, we prefer the stream tag.
Fixes #2698, where ICY tag contained useful information, but was
overwritten with bogus decoder tag data.
---
 src/decoder_api.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/decoder_api.c b/src/decoder_api.c
index eb316bc49..3ccf12a2e 100644
--- a/src/decoder_api.c
+++ b/src/decoder_api.c
@@ -271,8 +271,8 @@ decoder_data(struct decoder *decoder,
 			/* merge with tag from decoder plugin */
 			struct tag *tag;
 
-			tag = tag_merge(decoder->stream_tag,
-					decoder->decoder_tag);
+			tag = tag_merge(decoder->decoder_tag,
+					decoder->stream_tag);
 			cmd = do_send_tag(decoder, is, tag);
 			tag_free(tag);
 		} else
-- 
cgit v1.2.3