diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2006-02-26 18:13:09 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2006-02-26 18:13:09 +0000 |
| commit | 3291b9650897ec066d42fe087876150b50e386f5 (patch) | |
| tree | 03dd894dbaea2bee2d786531bc35aa2cb13665a8 | |
| parent | 5473581665cbe07029d8567a00b6247d4da29ac1 (diff) | |
src/gstplugin.c: Fix function declaration of _init() function.
Original commit message from CVS:
* src/gstplugin.c: (gst_plugin_template_init),
(gst_plugin_template_chain):
Fix function declaration of _init() function.
Remove unnecessary assertion clutter in chain function
(that also failed to return a flow value, causing
compiler warnings).
| m--------- | common | 0 | ||||
| -rw-r--r-- | gst-plugin/ChangeLog | 9 | ||||
| -rw-r--r-- | gst-plugin/src/gstplugin.c | 10 |
3 files changed, 13 insertions, 6 deletions
diff --git a/common b/common -Subproject 58567e5519f2d00a4592491db1a6e8302993279 +Subproject c09cd18d328f740ac532377fa5605b0f712cc6f diff --git a/gst-plugin/ChangeLog b/gst-plugin/ChangeLog index 056d4e6..ef16383 100644 --- a/gst-plugin/ChangeLog +++ b/gst-plugin/ChangeLog @@ -1,3 +1,12 @@ +2006-02-26 Tim-Philipp Müller <tim at centricular dot net> + + * src/gstplugin.c: (gst_plugin_template_init), + (gst_plugin_template_chain): + Fix function declaration of _init() function. + Remove unnecessary assertion clutter in chain function + (that also failed to return a flow value, causing + compiler warnings). + 2006-02-07 Stefan Kost <ensonic@users.sf.net> * src/gstplugin.c: (gst_plugin_template_set_caps), diff --git a/gst-plugin/src/gstplugin.c b/gst-plugin/src/gstplugin.c index d138e95..1f23b57 100644 --- a/gst-plugin/src/gstplugin.c +++ b/gst-plugin/src/gstplugin.c @@ -92,7 +92,8 @@ GST_STATIC_PAD_TEMPLATE ( static void gst_plugin_template_class_init (GstPluginTemplateClass *klass); static void gst_plugin_template_base_init (GstPluginTemplateClass *klass); -static void gst_plugin_template_init (GstPluginTemplate *filter); +static void gst_plugin_template_init (GstPluginTemplate *filter, + GstPluginTemplateClass *gclass); static void gst_plugin_template_set_property (GObject *object, guint prop_id, const GValue *value, @@ -176,7 +177,8 @@ gst_plugin_template_class_init (GstPluginTemplateClass *klass) * initialize structure */ static void -gst_plugin_template_init (GstPluginTemplate *filter, GstPluginTemplateClass * klass) +gst_plugin_template_init (GstPluginTemplate *filter, + GstPluginTemplateClass * gclass) { GstElementClass *klass = GST_ELEMENT_GET_CLASS (filter); @@ -258,11 +260,7 @@ gst_plugin_template_chain (GstPad *pad, GstBuffer *buf) { GstPluginTemplate *filter; - g_return_if_fail (GST_IS_PAD (pad)); - g_return_if_fail (buf != NULL); - filter = GST_PLUGIN_TEMPLATE (GST_OBJECT_PARENT (pad)); - g_return_if_fail (GST_IS_PLUGIN_TEMPLATE (filter)); if (filter->silent == FALSE) g_print ("I'm plugged, therefore I'm in.\n"); |