mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/mpegdemux/: Fix conflicting public names in new mpeg demuxers.

Browse source 
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
This commit is contained in:
Edward Hervey 2008-09-09 11:47:42 +00:00
parent 8618e452ae
commit 7359989bdb
4 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2008-09-09 Edward Hervey <edward.hervey@collabora.co.uk>
* 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
2008-09-08 Michael Smith <msmith@songbirdnest.com>
* gst/aiffparse/aiffparse.c:

6
gst/mpegdemux/flumpegdemux.c
View file

@ -53,9 +53,9 @@ GST_DEBUG_CATEGORY_EXTERN (gstflusectionfilter_debug);
static gboolean
plugin_init (GstPlugin * plugin)
{
GST_DEBUG_CATEGORY_INIT (gstflupesfilter_debug, "flupesfilter", 0,
GST_DEBUG_CATEGORY_INIT (gstflupesfilter_debug, "mpegpesfilter", 0,
"MPEG-TS/PS PES filter output");
GST_DEBUG_CATEGORY_INIT (gstflusectionfilter_debug, "flusectionfilter", 0,
GST_DEBUG_CATEGORY_INIT (gstflusectionfilter_debug, "mpegsectionfilter", 0,
"MPEG-TS Section filter output");
if (!gst_flups_demux_plugin_init (plugin))
@ -68,7 +68,7 @@ plugin_init (GstPlugin * plugin)
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"flumpegdemux",
"mpegdemux2",
"MPEG demuxers",
plugin_init, VERSION,
GST_LICENSE_UNKNOWN, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);

8
gst/mpegdemux/gstmpegdemux.c
View file

@ -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;

6
gst/mpegdemux/gstmpegtsdemux.c
View file

@ -226,10 +226,10 @@ gst_fluts_demux_get_type (void)
};
fluts_demux_type =
g_type_register_static (GST_TYPE_ELEMENT, "GstFluTSDemux",
g_type_register_static (GST_TYPE_ELEMENT, "GstMpegTSDemux",
&fluts_demux_info, 0);
GST_DEBUG_CATEGORY_INIT (gstflutsdemux_debug, "flutsdemux", 0,
GST_DEBUG_CATEGORY_INIT (gstflutsdemux_debug, "mpegtsdemux", 0,
"MPEG program stream demultiplexer element");
}
@ -2622,7 +2622,7 @@ gst_fluts_demux_get_property (GObject * object, guint prop_id,
gboolean
gst_fluts_demux_plugin_init (GstPlugin * plugin)
{
if (!gst_element_register (plugin, "flutsdemux",
if (!gst_element_register (plugin, "mpegtsdemux",
GST_RANK_PRIMARY, GST_TYPE_FLUTS_DEMUX))
return FALSE;