summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2008-11-13 16:17:38 +0000
committerWim Taymans <wim.taymans@gmail.com>2008-11-13 16:17:38 +0000
commitc97549583815a9f60e5f15884e6ecfa3c40a233b (patch)
tree7977bf0ad64cea4a486abc7bcfc01fb70f678a88
parentbe3906c91892cb9ecf56782615b301762d67ea4f (diff)
gst/rtsp/: Remove google extension again, it's not needed anymore because we never send multiple transports anymore.
Original commit message from CVS: * gst/rtsp/Makefile.am: * gst/rtsp/gstrtsp.c: (plugin_init): * gst/rtsp/gstrtspgoogle.c: * gst/rtsp/gstrtspgoogle.h: Remove google extension again, it's not needed anymore because we never send multiple transports anymore.
-rw-r--r--ChangeLog9
-rw-r--r--gst/rtsp/Makefile.am5
-rw-r--r--gst/rtsp/gstrtsp.c5
3 files changed, 11 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index df9d00b8..5038c28b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2008-11-13 Wim Taymans <wim.taymans@collabora.co.uk>
+ * gst/rtsp/Makefile.am:
+ * gst/rtsp/gstrtsp.c: (plugin_init):
+ * gst/rtsp/gstrtspgoogle.c:
+ * gst/rtsp/gstrtspgoogle.h:
+ Remove google extension again, it's not needed anymore because we never
+ send multiple transports anymore.
+
+2008-11-13 Wim Taymans <wim.taymans@collabora.co.uk>
+
Based on patch by: Eric Zhang <chao.zhang at access-company dot com>
* gst/rtsp/gstrtspsrc.c: (gst_rtsp_nat_method_get_type),
diff --git a/gst/rtsp/Makefile.am b/gst/rtsp/Makefile.am
index 954868cb..91414813 100644
--- a/gst/rtsp/Makefile.am
+++ b/gst/rtsp/Makefile.am
@@ -1,7 +1,7 @@
plugin_LTLIBRARIES = libgstrtsp.la
libgstrtsp_la_SOURCES = gstrtsp.c gstrtspsrc.c \
- gstrtpdec.c gstrtspext.c gstrtspgoogle.c
+ gstrtpdec.c gstrtspext.c
libgstrtsp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
libgstrtsp_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \
@@ -14,5 +14,4 @@ libgstrtsp_la_LIBTOOLFLAGS = --tag=disable-static
noinst_HEADERS = gstrtspsrc.h \
gstrtsp.h \
gstrtpdec.h \
- gstrtspext.h \
- gstrtspgoogle.h
+ gstrtspext.h
diff --git a/gst/rtsp/gstrtsp.c b/gst/rtsp/gstrtsp.c
index 476ebaa5..045c03a6 100644
--- a/gst/rtsp/gstrtsp.c
+++ b/gst/rtsp/gstrtsp.c
@@ -47,7 +47,6 @@
#include "gstrtpdec.h"
#include "gstrtspsrc.h"
-#include "gstrtspgoogle.h"
static gboolean
plugin_init (GstPlugin * plugin)
@@ -58,10 +57,6 @@ plugin_init (GstPlugin * plugin)
if (!gst_element_register (plugin, "rtpdec", GST_RANK_NONE, GST_TYPE_RTP_DEC))
return FALSE;
- if (!gst_element_register (plugin, "rtspgoogle", GST_RANK_SECONDARY,
- GST_TYPE_RTSP_GOOGLE)) {
- return FALSE;
- }
return TRUE;
}