summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2003-11-05 11:01:03 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2003-11-05 11:01:03 +0000
commitf1b647a6f59684ba8ceb66c59c40765656ec63b8 (patch)
tree315b1f8a408e40d65dada8d26e488950cac987c5
parent672e4390995fc87f346d79610f34adb6ce7f19f4 (diff)
downloadgst-plugins-bad-f1b647a6f59684ba8ceb66c59c40765656ec63b8.tar.gz
gst-plugins-bad-f1b647a6f59684ba8ceb66c59c40765656ec63b8.tar.bz2
gst-plugins-bad-f1b647a6f59684ba8ceb66c59c40765656ec63b8.zip
Remove obsolete external function call and do all element registrations in plugin_init()
Original commit message from CVS: Remove obsolete external function call and do all element registrations in plugin_init()
-rw-r--r--ext/xvid/gstxvid.c6
-rw-r--r--ext/xvid/gstxviddec.c10
-rw-r--r--ext/xvid/gstxviddec.h2
-rw-r--r--ext/xvid/gstxvidenc.c13
-rw-r--r--ext/xvid/gstxvidenc.h2
5 files changed, 4 insertions, 29 deletions
diff --git a/ext/xvid/gstxvid.c b/ext/xvid/gstxvid.c
index 74733ac3..44f40b85 100644
--- a/ext/xvid/gstxvid.c
+++ b/ext/xvid/gstxvid.c
@@ -87,8 +87,10 @@ gst_xvid_error (int errorcode)
static gboolean
plugin_init (GstPlugin *plugin)
{
- return (gst_xviddec_plugin_init(plugin) &&
- gst_xvidenc_plugin_init(plugin));
+ return (gst_element_register (plugin, "xvidenc",
+ GST_RANK_NONE, GST_TYPE_XVIDENC) &&
+ gst_element_register (plugin, "xviddec",
+ GST_RANK_NONE, GST_TYPE_XVIDDEC));
}
GST_PLUGIN_DEFINE (
diff --git a/ext/xvid/gstxviddec.c b/ext/xvid/gstxviddec.c
index 161ae5be..ad1b5133 100644
--- a/ext/xvid/gstxviddec.c
+++ b/ext/xvid/gstxviddec.c
@@ -385,13 +385,3 @@ gst_xviddec_connect (GstPad *pad,
return gst_xviddec_negotiate(xviddec);
}
-
-
-gboolean
-gst_xviddec_plugin_init (GstPlugin *plugin)
-{
- if (!gst_element_register (plugin, "xviddec", GST_RANK_PRIMARY, GST_TYPE_XVIDDEC))
- return FALSE;
-
- return TRUE;
-}
diff --git a/ext/xvid/gstxviddec.h b/ext/xvid/gstxviddec.h
index 98916ce7..76fc6d89 100644
--- a/ext/xvid/gstxviddec.h
+++ b/ext/xvid/gstxviddec.h
@@ -64,8 +64,6 @@ struct _GstXvidDecClass {
GType gst_xviddec_get_type(void);
-gboolean gst_xviddec_plugin_init (GstPlugin *plugin);
-
#ifdef __cplusplus
}
#endif /* __cplusplus */
diff --git a/ext/xvid/gstxvidenc.c b/ext/xvid/gstxvidenc.c
index d8262eaa..00641f68 100644
--- a/ext/xvid/gstxvidenc.c
+++ b/ext/xvid/gstxvidenc.c
@@ -482,16 +482,3 @@ gst_xvidenc_get_property (GObject *object,
break;
}
}
-
-
-gboolean
-gst_xvidenc_plugin_init (GstPlugin *plugin)
-{
- if (!gst_library_load("gstvideo"))
- return FALSE;
-
- if (!gst_element_register (plugin, "xvidenc", GST_RANK_NONE, GST_TYPE_XVIDENC))
- return FALSE;
-
- return TRUE;
-}
diff --git a/ext/xvid/gstxvidenc.h b/ext/xvid/gstxvidenc.h
index f8266a97..7597e196 100644
--- a/ext/xvid/gstxvidenc.h
+++ b/ext/xvid/gstxvidenc.h
@@ -73,8 +73,6 @@ struct _GstXvidEncClass {
GType gst_xvidenc_get_type(void);
-gboolean gst_xvidenc_plugin_init (GstPlugin *plugin);
-
#ifdef __cplusplus
}
#endif /* __cplusplus */