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.

decoder_api: prefer stream_tag over decoder_tag
179502fe · Thomas Jansen · b6b377ed · 179502fe
Commit 179502fe authored Dec 07, 2009 by Thomas Jansen
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

decoder_api.c src/decoder_api.c +2 -2

No files found.
--- 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