diff options
author | Max Kellermann <max@duempel.org> | 2010-03-28 19:31:47 +0200 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2010-03-28 19:31:47 +0200 |
commit | e9beea072d17ec01a124c189c42df1a1350a4106 (patch) | |
tree | 7334654ded3a281e53546671f9fcb8e4b1857545 /src/tag.c | |
parent | e69bb3b337c8f805302a4ba9e46c7bc36d8df80c (diff) | |
parent | d612e5e0ab27b93fcfdcf25eb3014ea4e17cd41c (diff) | |
download | mpd-e9beea072d17ec01a124c189c42df1a1350a4106.tar.gz mpd-e9beea072d17ec01a124c189c42df1a1350a4106.tar.xz mpd-e9beea072d17ec01a124c189c42df1a1350a4106.zip |
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
Diffstat (limited to '')
-rw-r--r-- | src/tag.c | 16 |
1 files changed, 16 insertions, 0 deletions
@@ -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) { |