From 3a496fd7ebb90d12bad86c6ded97a75e134794f6 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 28 May 2007 16:37:47 +0000 Subject: Rename elements to avoid conflict with farsight elements with the same name. Fixes #430664. Original commit message from CVS: * docs/plugins/gst-plugins-bad-plugins-docs.sgml: * docs/plugins/gst-plugins-bad-plugins-sections.txt: * gst/rtpmanager/gstrtpbin.c: (create_session), (create_stream), (gst_rtp_bin_class_init), (create_recv_rtp), (create_recv_rtcp), (create_send_rtp), (create_rtcp), (gst_rtp_bin_request_new_pad): * gst/rtpmanager/gstrtpclient.c: (create_stream), (gst_rtp_client_request_new_pad): * gst/rtpmanager/gstrtpjitterbuffer.c: (gst_rtp_jitter_buffer_clear_pt_map), (gst_rtp_jitter_buffer_loop): * gst/rtpmanager/gstrtpmanager.c: (plugin_init): * gst/rtpmanager/gstrtpptdemux.c: * gst/rtpmanager/gstrtpsession.c: (gst_rtp_session_class_init), (gst_rtp_session_request_new_pad): * gst/rtpmanager/gstrtpssrcdemux.c: Rename elements to avoid conflict with farsight elements with the same name. Fixes #430664. --- gst/rtpmanager/gstrtpmanager.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'gst/rtpmanager/gstrtpmanager.c') diff --git a/gst/rtpmanager/gstrtpmanager.c b/gst/rtpmanager/gstrtpmanager.c index 1490c4cb..eed5c25f 100644 --- a/gst/rtpmanager/gstrtpmanager.c +++ b/gst/rtpmanager/gstrtpmanager.c @@ -31,26 +31,27 @@ static gboolean plugin_init (GstPlugin * plugin) { - if (!gst_element_register (plugin, "rtpbin", GST_RANK_NONE, GST_TYPE_RTP_BIN)) + if (!gst_element_register (plugin, "gstrtpbin", GST_RANK_NONE, + GST_TYPE_RTP_BIN)) return FALSE; - if (!gst_element_register (plugin, "rtpclient", GST_RANK_NONE, + if (!gst_element_register (plugin, "gstrtpclient", GST_RANK_NONE, GST_TYPE_RTP_CLIENT)) return FALSE; - if (!gst_element_register (plugin, "rtpjitterbuffer", GST_RANK_NONE, + if (!gst_element_register (plugin, "gstrtpjitterbuffer", GST_RANK_NONE, GST_TYPE_RTP_JITTER_BUFFER)) return FALSE; - if (!gst_element_register (plugin, "rtpptdemux", GST_RANK_NONE, + if (!gst_element_register (plugin, "gstrtpptdemux", GST_RANK_NONE, GST_TYPE_RTP_PT_DEMUX)) return FALSE; - if (!gst_element_register (plugin, "rtpsession", GST_RANK_NONE, + if (!gst_element_register (plugin, "gstrtpsession", GST_RANK_NONE, GST_TYPE_RTP_SESSION)) return FALSE; - if (!gst_element_register (plugin, "rtpssrcdemux", GST_RANK_NONE, + if (!gst_element_register (plugin, "gstrtpssrcdemux", GST_RANK_NONE, GST_TYPE_RTP_SSRC_DEMUX)) return FALSE; @@ -59,6 +60,6 @@ plugin_init (GstPlugin * plugin) GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, - "rtpmanager", + "gstrtpmanager", "RTP session management plugin library", plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) -- cgit v1.2.1