mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-02 08:42:32 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/mad/gstid3tag.c: Do tag merging correctly (#339918). Output taglists properly in debug statements too while we're...

Browse source 
Original commit message from CVS:
Patch by: James "Doc" Livingston  <doclivingston gmail com>
* 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.
This commit is contained in:
James Doc Livingston 2006-05-18 13:00:21 +00:00 committed by Tim-Philipp Müller
parent 2f68d625c1
commit 3cf36d68fb
3 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2006-05-18 Tim-Philipp Müller <tim at centricular dot net>
Patch by: James "Doc" Livingston <doclivingston gmail com>
* 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 <thaytan@mad.scientist.com>
* ext/a52dec/gsta52dec.c: (gst_a52dec_chain):

2
common

@ -1 +1 @@
Subproject commit e41606ab2c6a31be473de511b5fd776bd2593b56
Subproject commit a5b66304e7abe1440a0f8b0ed232ffbc56e8f3de

13
ext/mad/gstid3tag.c
View file

@ -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);
}