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()
This commit is contained in:
parent
672e439099
commit
f1b647a6f5
@ -87,8 +87,10 @@ gst_xvid_error (int errorcode)
|
|||||||
static gboolean
|
static gboolean
|
||||||
plugin_init (GstPlugin *plugin)
|
plugin_init (GstPlugin *plugin)
|
||||||
{
|
{
|
||||||
return (gst_xviddec_plugin_init(plugin) &&
|
return (gst_element_register (plugin, "xvidenc",
|
||||||
gst_xvidenc_plugin_init(plugin));
|
GST_RANK_NONE, GST_TYPE_XVIDENC) &&
|
||||||
|
gst_element_register (plugin, "xviddec",
|
||||||
|
GST_RANK_NONE, GST_TYPE_XVIDDEC));
|
||||||
}
|
}
|
||||||
|
|
||||||
GST_PLUGIN_DEFINE (
|
GST_PLUGIN_DEFINE (
|
||||||
|
@ -385,13 +385,3 @@ gst_xviddec_connect (GstPad *pad,
|
|||||||
|
|
||||||
return gst_xviddec_negotiate(xviddec);
|
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;
|
|
||||||
}
|
|
||||||
|
@ -64,8 +64,6 @@ struct _GstXvidDecClass {
|
|||||||
|
|
||||||
GType gst_xviddec_get_type(void);
|
GType gst_xviddec_get_type(void);
|
||||||
|
|
||||||
gboolean gst_xviddec_plugin_init (GstPlugin *plugin);
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif /* __cplusplus */
|
#endif /* __cplusplus */
|
||||||
|
@ -482,16 +482,3 @@ gst_xvidenc_get_property (GObject *object,
|
|||||||
break;
|
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;
|
|
||||||
}
|
|
||||||
|
@ -73,8 +73,6 @@ struct _GstXvidEncClass {
|
|||||||
|
|
||||||
GType gst_xvidenc_get_type(void);
|
GType gst_xvidenc_get_type(void);
|
||||||
|
|
||||||
gboolean gst_xvidenc_plugin_init (GstPlugin *plugin);
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif /* __cplusplus */
|
#endif /* __cplusplus */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user