Merge release 0.15.9 from branch 'v0.15.x'

Conflicts:
	NEWS
	configure.ac
	src/cue/cue_tag.c
	src/decoder/mpcdec_decoder_plugin.c
	src/player_thread.c

1 files changed, 16 insertions, 0 deletions

diff --git a/src/tag.c b/src/tag.c
index fb4c40a55..aa96a468f 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -282,6 +282,22 @@ tag_merge(const struct tag *base, const struct tag *add)
 	return ret;
 }
 
+struct tag *
+tag_merge_replace(struct tag *base, struct tag *add)
+{
+	if (add == NULL)
+		return base;
+
+	if (base == NULL)
+		return add;
+
+	struct tag *tag = tag_merge(base, add);
+	tag_free(base);
+	tag_free(add);
+
+	return tag;
+}
+
 const char *
 tag_get_value(const struct tag *tag, enum tag_type type)
 {