From: Wim Taymans <wim.taymans@gmail.com>
Date: Fri, 27 Jul 2007 10:12:55 +0000 (+0000)
Subject: gst/: Fix include paths and link dependecies for rtsp extension.
X-Git-Tag: 1.19.3~505^2~1713
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c8bd2c02a3ff232ac4f0c007df5467c41c367a1d;p=platform%2Fupstream%2Fgstreamer.git

gst/: Fix include paths and link dependecies for rtsp extension.

Original commit message from CVS:
* gst/asfdemux/Makefile.am:
* gst/asfdemux/gstrtspwms.c: (gst_rtsp_wms_parse_sdp), (_do_init),
(gst_rtsp_wms_class_init):
* gst/realmedia/Makefile.am:
* gst/realmedia/rtspreal.c: (rtsp_ext_real_get_transports),
(rtsp_ext_real_before_send), (rtsp_ext_real_after_send),
(rtsp_ext_real_parse_sdp), (rtsp_ext_real_stream_select),
(_do_init), (gst_rtsp_real_class_init):
Fix include paths and link dependecies for rtsp extension.
---

diff --git a/ChangeLog b/ChangeLog
index 9067eac..92cf31a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-07-27  Wim Taymans  <wim.taymans@gmail.com>
+
+	* gst/asfdemux/Makefile.am:
+	* gst/asfdemux/gstrtspwms.c: (gst_rtsp_wms_parse_sdp), (_do_init),
+	(gst_rtsp_wms_class_init):
+	* gst/realmedia/Makefile.am:
+	* gst/realmedia/rtspreal.c: (rtsp_ext_real_get_transports),
+	(rtsp_ext_real_before_send), (rtsp_ext_real_after_send),
+	(rtsp_ext_real_parse_sdp), (rtsp_ext_real_stream_select),
+	(_do_init), (gst_rtsp_real_class_init):
+	Fix include paths and link dependecies for rtsp extension.
+
 2007-07-26  Wim Taymans  <wim.taymans@gmail.com>
 
 	* gst/realmedia/Makefile.am:
diff --git a/gst/asfdemux/Makefile.am b/gst/asfdemux/Makefile.am
index 4bc7f1e..6a339ff 100644
--- a/gst/asfdemux/Makefile.am
+++ b/gst/asfdemux/Makefile.am
@@ -3,8 +3,7 @@ plugin_LTLIBRARIES = libgstasf.la
 libgstasf_la_SOURCES = gstasfdemux.c gstasf.c asfheaders.c asfpacket.c gstrtspwms.c
 libgstasf_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libgstasf_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS)\
-		-lgstriff-@GST_MAJORMINOR@ -lgstinterfaces-@GST_MAJORMINOR@ \
-		-lgstrtsp-@GST_MAJORMINOR@ -lgstsdp-@GST_MAJORMINOR@
+		-lgstriff-@GST_MAJORMINOR@ -lgstrtsp-@GST_MAJORMINOR@ -lgstsdp-@GST_MAJORMINOR@
 libgstasf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS = gstasfdemux.h asfheaders.h asfpacket.h gstasfmux.h gstrtspwms.h
diff --git a/gst/asfdemux/gstrtspwms.c b/gst/asfdemux/gstrtspwms.c
index 452551f..2b32ecf 100644
--- a/gst/asfdemux/gstrtspwms.c
+++ b/gst/asfdemux/gstrtspwms.c
@@ -32,7 +32,7 @@
 
 #include <string.h>
 
-#include <gst/interfaces/rtspextension.h>
+#include <gst/rtsp/gstrtspextension.h>
 
 #include "gstrtspwms.h"
 
diff --git a/gst/realmedia/Makefile.am b/gst/realmedia/Makefile.am
index da9d03b..e66fe09 100644
--- a/gst/realmedia/Makefile.am
+++ b/gst/realmedia/Makefile.am
@@ -4,7 +4,6 @@ libgstrmdemux_la_SOURCES = rademux.c rmdemux.c rmutils.c rdtdepay.c rtspreal.c
 
 libgstrmdemux_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS)
 libgstrmdemux_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS)\
-	     -lgstinterfaces-@GST_MAJORMINOR@ \
 	     -lgstrtsp-@GST_MAJORMINOR@ -lgstsdp-@GST_MAJORMINOR@
 libgstrmdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
diff --git a/gst/realmedia/rtspreal.c b/gst/realmedia/rtspreal.c
index bcde268..23aebf6 100644
--- a/gst/realmedia/rtspreal.c
+++ b/gst/realmedia/rtspreal.c
@@ -37,7 +37,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <gst/interfaces/rtspextension.h>
+#include <gst/rtsp/gstrtspextension.h>
 #include <gst/rtsp/gstrtspbase64.h>
 
 #include "rtspreal.h"