From 7359989bdb60c61d32802c00a7c4cdb4362f96aa Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Tue, 9 Sep 2008 11:47:42 +0000 Subject: gst/mpegdemux/: Fix conflicting public names in new mpeg demuxers. Original commit message from CVS: * gst/mpegdemux/flumpegdemux.c: (plugin_init): * gst/mpegdemux/gstmpegdemux.c: (gst_flups_demux_sync_get_type), (gst_flups_demux_get_type), (gst_flups_demux_plugin_init): * gst/mpegdemux/gstmpegtsdemux.c: (gst_fluts_demux_get_type), (gst_fluts_demux_plugin_init): Fix conflicting public names in new mpeg demuxers. Fixes #550468 --- gst/mpegdemux/gstmpegdemux.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gst/mpegdemux/gstmpegdemux.c') diff --git a/gst/mpegdemux/gstmpegdemux.c b/gst/mpegdemux/gstmpegdemux.c index 4b30b00d..6859a4f6 100644 --- a/gst/mpegdemux/gstmpegdemux.c +++ b/gst/mpegdemux/gstmpegdemux.c @@ -120,7 +120,7 @@ gst_flups_demux_sync_get_type (void) }; if (sync_type == 0) - sync_type = g_enum_register_static ("GstFluPSDemuxSync", sync_types); + sync_type = g_enum_register_static ("GstPSDemuxSync", sync_types); return sync_type; } @@ -209,10 +209,10 @@ gst_flups_demux_get_type (void) }; flups_demux_type = - g_type_register_static (GST_TYPE_ELEMENT, "GstFluPSDemux", + g_type_register_static (GST_TYPE_ELEMENT, "GstMpegPSDemux", &flups_demux_info, 0); - GST_DEBUG_CATEGORY_INIT (gstflupsdemux_debug, "flupsdemux", 0, + GST_DEBUG_CATEGORY_INIT (gstflupsdemux_debug, "mpegpsdemux", 0, "MPEG program stream demultiplexer element"); } @@ -1861,7 +1861,7 @@ gst_flups_demux_change_state (GstElement * element, GstStateChange transition) gboolean gst_flups_demux_plugin_init (GstPlugin * plugin) { - if (!gst_element_register (plugin, "flupsdemux", + if (!gst_element_register (plugin, "mpegpsdemux", GST_RANK_PRIMARY, GST_TYPE_FLUPS_DEMUX)) return FALSE; -- cgit v1.2.1