From 26f2316b273bdbd9160477e0b4e40951be1a86b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Wed, 31 Oct 2007 18:08:21 +0000 Subject: [PATCH] tests/examples/metadata/read-metadata.c: Use _KEEP as merge mode rather than _KEEP_ALL, so tags arriving in a second ... Original commit message from CVS: * tests/examples/metadata/read-metadata.c: (message_loop): Use _KEEP as merge mode rather than _KEEP_ALL, so tags arriving in a second or third tag message are added to the tag list as well. --- ChangeLog | 7 +++++++ tests/examples/metadata/read-metadata.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 81b78ff2e6..0ef23331d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-10-31 Tim-Philipp Müller + + * tests/examples/metadata/read-metadata.c: (message_loop): + Use _KEEP as merge mode rather than _KEEP_ALL, so tags + arriving in a second or third tag message are added to + the tag list as well. + 2007-10-31 Stefan Kost * libs/gst/base/gstbasesrc.c: diff --git a/tests/examples/metadata/read-metadata.c b/tests/examples/metadata/read-metadata.c index dbd2ef427d..7f3497af06 100644 --- a/tests/examples/metadata/read-metadata.c +++ b/tests/examples/metadata/read-metadata.c @@ -67,7 +67,7 @@ message_loop (GstElement * element, GstTagList ** tags) gst_message_parse_tag (message, &new_tags); if (*tags) - *tags = gst_tag_list_merge (*tags, new_tags, GST_TAG_MERGE_KEEP_ALL); + *tags = gst_tag_list_merge (*tags, new_tags, GST_TAG_MERGE_KEEP); else *tags = new_tags; break;