diff options
| author | Thomas Jansen <mithi@mithi.net> | 2009-12-07 14:52:48 +0100 |
|---|---|---|
| committer | Thomas Jansen <mithi@mithi.net> | 2009-12-07 14:52:48 +0100 |
| commit | 179502fe93532a3686c08f07d9ef6effaaf4f25a (patch) | |
| tree | f4e2be33850c0c7fc02f770d82a3cfa126506b57 | |
| parent | b6b377edd1c35f01a17feadb595a20b4b2444ad7 (diff) | |
| download | mpd-179502fe93532a3686c08f07d9ef6effaaf4f25a.tar.gz mpd-179502fe93532a3686c08f07d9ef6effaaf4f25a.tar.xz mpd-179502fe93532a3686c08f07d9ef6effaaf4f25a.zip | |
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.
| -rw-r--r-- | src/decoder_api.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 |