From 2ee0cdf799924076fe2fc07d6ad21d25eb583c1d Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 7 Mar 2006 17:06:53 +0000 Subject: [PATCH] docs/pwg/: Applied patch from Christophe Fergeau, fixes #333416 Original commit message from CVS: * docs/pwg/advanced-tagging.xml: * docs/pwg/building-pads.xml: Applied patch from Christophe Fergeau, fixes #333416 --- ChangeLog | 6 ++++++ docs/pwg/advanced-tagging.xml | 6 +++--- docs/pwg/building-pads.xml | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index adbb12d675..e4d62ae084 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-03-07 Wim Taymans + + * docs/pwg/advanced-tagging.xml: + * docs/pwg/building-pads.xml: + Applied patch from Christophe Fergeau, fixes #333416 + 2006-03-07 Wim Taymans * docs/libs/gstreamer-libs-sections.txt: diff --git a/docs/pwg/advanced-tagging.xml b/docs/pwg/advanced-tagging.xml index 16466f8f2a..107db7035f 100644 --- a/docs/pwg/advanced-tagging.xml +++ b/docs/pwg/advanced-tagging.xml @@ -273,10 +273,10 @@ gst_my_filter_loopfunc (GstElement *element) } /* merge tags with the ones retrieved from the application */ - if (gst_tag_setter_get_list (tagsetter)) { + if ((gst_tag_setter_get_tag_list (tagsetter)) { gst_tag_list_insert (taglist, - gst_tag_setter_get_list (tagsetter), - gst_tag_setter_get_merge_mode (tagsetter)); + gst_tag_setter_get_tag_list (tagsetter), + gst_tag_setter_get_tag_merge_mode (tagsetter)); } /* write tags */ diff --git a/docs/pwg/building-pads.xml b/docs/pwg/building-pads.xml index ddd2df2d8a..5054013946 100644 --- a/docs/pwg/building-pads.xml +++ b/docs/pwg/building-pads.xml @@ -84,9 +84,9 @@ static gboolean gst_my_filter_event (GstPad *pad, static void -gst_my_filter_init (GstMyFilter *filter) +gst_my_filter_init (GstMyFilter *filter, GstMyFilterClass *filter_klass) { - GstElementClass *klass = GST_ELEMENT_GET_CLASS (filter); + GstElementClass *klass = GST_ELEMENT_CLASS (filter_klass); /* pad through which data comes in to the element */ filter->sinkpad = gst_pad_new_from_template (