From 00a155333c5e3b9832b82b47f11ce7574580537b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.co.uk>
Date: Tue, 10 Feb 2009 17:02:24 +0000
Subject: Moved rtpmux from gst-p-farsight to -bad

---
 gst/rtpmux/Makefile.am     | 10 +++++-----
 gst/rtpmux/gstrtpdtmfmux.c | 14 ++++++--------
 gst/rtpmux/gstrtpmuxer.c   |  4 ++--
 3 files changed, 13 insertions(+), 15 deletions(-)

(limited to 'gst/rtpmux')

diff --git a/gst/rtpmux/Makefile.am b/gst/rtpmux/Makefile.am
index 908181be..be9bc080 100644
--- a/gst/rtpmux/Makefile.am
+++ b/gst/rtpmux/Makefile.am
@@ -1,10 +1,10 @@
-plugin_LTLIBRARIES = libgstrtpmuxer.la
+plugin_LTLIBRARIES = libgstrtpmux.la
 
-libgstrtpmuxer_la_SOURCES = gstrtpmuxer.c gstrtpmux.c gstrtpdtmfmux.c
+libgstrtpmux_la_SOURCES = gstrtpmuxer.c gstrtpmux.c gstrtpdtmfmux.c
 
-libgstrtpmuxer_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ERROR_CFLAGS) -DEXTERN_BUF -DRTP_SUPPORT
-libgstrtpmuxer_la_LIBADD = $(GST_LIBS_LIBS)
-libgstrtpmuxer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_MAJORMINOR@
+libgstrtpmux_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ERROR_CFLAGS) -DEXTERN_BUF -DRTP_SUPPORT
+libgstrtpmux_la_LIBADD = $(GST_LIBS_LIBS)
+libgstrtpmux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_MAJORMINOR@
 
 noinst_HEADERS = gstrtpmux.h gstrtpdtmfmux.h
 
diff --git a/gst/rtpmux/gstrtpdtmfmux.c b/gst/rtpmux/gstrtpdtmfmux.c
index 8b4c4496..9928cc6e 100644
--- a/gst/rtpmux/gstrtpdtmfmux.c
+++ b/gst/rtpmux/gstrtpdtmfmux.c
@@ -26,8 +26,8 @@
 /**
  * SECTION:element-rtpdtmfmux
  * @short_description: mixes RTP DTMF streams into other RTP streams
- * <refsect2>
- * <para>
+ * @see_also: rtpdtmfsrc, dtmfsrc
+ *
  * The RTPDTMFMuxer mixes/muxes RTP DTMF stream(s) into other RTP
  * streams. It does exactly what it's parent (RTPMuxer) does, except
  * that it allows upstream peer elements to request exclusive access
@@ -40,11 +40,10 @@
  * structure of name "stream-lock" with only one boolean field:
  * "lock". If this field is set to TRUE, the request is for the
  * acquisition of the lock, otherwise it is for release of the lock.
- * </para>
- * <para>For example, the following code in an upstream peer element
+ *
+ * For example, the following code in an upstream peer element
  * requests the acquisition of the stream lock:
- * </para>
- * <para>
+ *
  * <programlisting>
  * GstEvent *event;
  * GstStructure *structure;
@@ -58,8 +57,7 @@
  * event = gst_event_new_custom (GST_EVENT_CUSTOM_DOWNSTREAM_OOB, structure);
  * gst_pad_push_event (dtmfsrc->srcpad, event);
  * </programlisting>
- * </para>
- * </refsect2>
+ *
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/gst/rtpmux/gstrtpmuxer.c b/gst/rtpmux/gstrtpmuxer.c
index a4837d7c..619418bd 100644
--- a/gst/rtpmux/gstrtpmuxer.c
+++ b/gst/rtpmux/gstrtpmuxer.c
@@ -43,6 +43,6 @@ plugin_init (GstPlugin * plugin)
 
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
-    "rtpmuxer",
+    "rtpmux",
     "RTP Muxer plugins",
-    plugin_init, "0.1", "LGPL", "Farsight", "http://farsight.sf.net");
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
-- 
cgit v1.2.1