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()

diff --git a/ext/xvid/gstxvid.c b/ext/xvid/gstxvid.c
index 74733ac..44f40b8 100644 (file)
--- 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 161ae5b..ad1b513 100644 (file)
--- 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 98916ce..76fc6d8 100644 (file)
--- 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 d8262ea..00641f6 100644 (file)
--- 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 f8266a9..7597e19 100644 (file)
--- 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 */