From 3cf36d68fb707373bf648346304c21c9075956ec Mon Sep 17 00:00:00 2001 From: James Doc Livingston Date: Thu, 18 May 2006 13:00:21 +0000 Subject: [PATCH] ext/mad/gstid3tag.c: Do tag merging correctly (#339918). Output taglists properly in debug statements too while we're... Original commit message from CVS: Patch by: James "Doc" Livingston * ext/mad/gstid3tag.c: (gst_id3_tag_get_tag_to_render): Do tag merging correctly (#339918). Output taglists properly in debug statements too while we're at it. --- ChangeLog | 8 ++++++++ common | 2 +- ext/mad/gstid3tag.c | 13 +++++++++---- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4454a6de70..7db43eae47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-05-18 Tim-Philipp Müller + + Patch by: James "Doc" Livingston + + * ext/mad/gstid3tag.c: (gst_id3_tag_get_tag_to_render): + Do tag merging correctly (#339918). Output taglists + properly in debug statements too while we're at it. + 2006-05-11 Jan Schmidt * ext/a52dec/gsta52dec.c: (gst_a52dec_chain): diff --git a/common b/common index e41606ab2c..a5b66304e7 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit e41606ab2c6a31be473de511b5fd776bd2593b56 +Subproject commit a5b66304e7abe1440a0f8b0ed232ffbc56e8f3de diff --git a/ext/mad/gstid3tag.c b/ext/mad/gstid3tag.c index d244145fe9..e6e0eaead2 100644 --- a/ext/mad/gstid3tag.c +++ b/ext/mad/gstid3tag.c @@ -861,9 +861,10 @@ gst_id3_tag_get_tag_to_render (GstID3Tag * tag) const GstTagList *taglist = gst_tag_setter_get_tag_list (GST_TAG_SETTER (tag)); - GST_DEBUG - ("preparing taglist to render: event_tags=%p, parsed_tags=%p, taglist=%p", - tag->event_tags, tag->parsed_tags, taglist); + GST_DEBUG ("preparing taglist to render:"); + GST_DEBUG (" event_tags = %" GST_PTR_FORMAT, tag->event_tags); + GST_DEBUG (" parsed_tags = %" GST_PTR_FORMAT, tag->parsed_tags); + GST_DEBUG (" taglist = %" GST_PTR_FORMAT, taglist); if (tag->event_tags) ret = gst_tag_list_copy (tag->event_tags); @@ -875,8 +876,12 @@ gst_id3_tag_get_tag_to_render (GstID3Tag * tag) } if (taglist) { if (ret) { - gst_tag_list_insert (ret, taglist, + GstTagList *tmp; + + tmp = gst_tag_list_merge (taglist, ret, gst_tag_setter_get_tag_merge_mode (GST_TAG_SETTER (tag))); + gst_tag_list_free (ret); + ret = tmp; } else { ret = gst_tag_list_copy (taglist); }