Imported Upstream version 0.11.99upstream/0.11.99

10 files changed, 20 insertions, 16 deletions

diff --git a/ext/amrnb/Makefile.am b/ext/amrnb/Makefile.am
index 9379396..6c7edfb 100644
--- a/ext/amrnb/Makefile.am
+++ b/ext/amrnb/Makefile.am
@@ -5,7 +5,7 @@ libgstamrnb_la_SOURCES = \
 	amrnbdec.c \
 	amrnbenc.c
 
-libgstamrnb_la_CFLAGS = -DGST_USE_UNSTABLE_API $(GST_PLUGINS_BASE_CFLAGS) \
+libgstamrnb_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AMRNB_CFLAGS)
 libgstamrnb_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
         -lgstaudio-@GST_API_VERSION@ \
diff --git a/ext/amrnb/Makefile.in b/ext/amrnb/Makefile.in
index 934d3a0..0a36c00 100644
--- a/ext/amrnb/Makefile.in
+++ b/ext/amrnb/Makefile.in
@@ -443,7 +443,7 @@ libgstamrnb_la_SOURCES = \
 	amrnbdec.c \
 	amrnbenc.c
 
-libgstamrnb_la_CFLAGS = -DGST_USE_UNSTABLE_API $(GST_PLUGINS_BASE_CFLAGS) \
+libgstamrnb_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AMRNB_CFLAGS)
 
 libgstamrnb_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
diff --git a/ext/amrwbdec/Makefile.am b/ext/amrwbdec/Makefile.am
index 64b6e6a..1ed0200 100644
--- a/ext/amrwbdec/Makefile.am
+++ b/ext/amrwbdec/Makefile.am
@@ -4,7 +4,7 @@ libgstamrwbdec_la_SOURCES = \
 	amrwb.c \
 	amrwbdec.c
 
-libgstamrwbdec_la_CFLAGS = -DGST_USE_UNSTABLE_API $(GST_PLUGINS_BASE_CFLAGS) \
+libgstamrwbdec_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AMRWB_CFLAGS)
 libgstamrwbdec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
 	$(GST_BASE_LIBS) \
diff --git a/ext/amrwbdec/Makefile.in b/ext/amrwbdec/Makefile.in
index adc413d..0af6b79 100644
--- a/ext/amrwbdec/Makefile.in
+++ b/ext/amrwbdec/Makefile.in
@@ -440,7 +440,7 @@ libgstamrwbdec_la_SOURCES = \
 	amrwb.c \
 	amrwbdec.c
 
-libgstamrwbdec_la_CFLAGS = -DGST_USE_UNSTABLE_API $(GST_PLUGINS_BASE_CFLAGS) \
+libgstamrwbdec_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AMRWB_CFLAGS)
 
 libgstamrwbdec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
diff --git a/ext/cdio/gstcdio.c b/ext/cdio/gstcdio.c
index 483ebf5..97737dd 100644
--- a/ext/cdio/gstcdio.c
+++ b/ext/cdio/gstcdio.c
@@ -22,6 +22,17 @@
 #include "config.h"
 #endif
 
+#include <gst/gst.h>
+
+static gboolean plugin_init (GstPlugin * plugin);
+
+/* cdio headers redefine VERSION etc., so do this here before including them */
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+    GST_VERSION_MINOR,
+    cdio,
+    "Read audio from audio CDs",
+    plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
+
 #include "gstcdio.h"
 #include "gstcdiocddasrc.h"
 
@@ -136,10 +147,3 @@ plugin_init (GstPlugin * plugin)
 
   return TRUE;
 }
-
-
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
-    GST_VERSION_MINOR,
-    cdio,
-    "Read audio from audio CDs",
-    plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/ext/dvdread/demo-play b/ext/dvdread/demo-play
index 1def730..ed9d4d8 100755
--- a/ext/dvdread/demo-play
+++ b/ext/dvdread/demo-play
@@ -2,5 +2,5 @@
 AUDIOSINK=`gconftool-2 -g /system/gstreamer/0.8/default/audiosink`
 VIDEOSINK=`gconftool-2 -g /system/gstreamer/0.8/default/videosink`
 gst-launch dvdreadsrc ! dvddemux name=demux .video_00 ! \
-	{ queue ! mpeg2dec ! ffmpegcolorspace ! videoscale ! $VIDEOSINK } \
+	{ queue ! mpeg2dec ! videoconvert ! videoscale ! $VIDEOSINK } \
 	{ demux.audio_00 ! queue ! a52dec ! audioconvert ! audioscale ! $AUDIOSINK }
diff --git a/ext/lame/Makefile.am b/ext/lame/Makefile.am
index d3a70c3..7cacf2a 100644
--- a/ext/lame/Makefile.am
+++ b/ext/lame/Makefile.am
@@ -1,7 +1,7 @@
 plugin_LTLIBRARIES = libgstlame.la
 
 libgstlame_la_SOURCES = gstlamemp3enc.c plugin.c
-libgstlame_la_CFLAGS = -DGST_USE_UNSTABLE_API \
+libgstlame_la_CFLAGS = \
         $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LAME_CFLAGS)
 libgstlame_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
 	$(GST_BASE_LIBS) $(GST_LIBS) $(LAME_LIBS)
diff --git a/ext/lame/Makefile.in b/ext/lame/Makefile.in
index f380e41..19a859d 100644
--- a/ext/lame/Makefile.in
+++ b/ext/lame/Makefile.in
@@ -437,7 +437,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 plugin_LTLIBRARIES = libgstlame.la
 libgstlame_la_SOURCES = gstlamemp3enc.c plugin.c
-libgstlame_la_CFLAGS = -DGST_USE_UNSTABLE_API \
+libgstlame_la_CFLAGS = \
         $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LAME_CFLAGS)
 
 libgstlame_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
diff --git a/ext/twolame/Makefile.am b/ext/twolame/Makefile.am
index 785fd8f..7503515 100644
--- a/ext/twolame/Makefile.am
+++ b/ext/twolame/Makefile.am
@@ -1,7 +1,7 @@
 plugin_LTLIBRARIES = libgsttwolame.la
 
 libgsttwolame_la_SOURCES = gsttwolamemp2enc.c
-libgsttwolame_la_CFLAGS = -DGST_USE_UNSTABLE_API \
+libgsttwolame_la_CFLAGS = \
 	$(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(TWOLAME_CFLAGS)
 libgsttwolame_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
 	-lgstaudio-@GST_API_VERSION@ -lgstpbutils-@GST_API_VERSION@ \
diff --git a/ext/twolame/Makefile.in b/ext/twolame/Makefile.in
index 0a81e0c..ac1087d 100644
--- a/ext/twolame/Makefile.in
+++ b/ext/twolame/Makefile.in
@@ -435,7 +435,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 plugin_LTLIBRARIES = libgsttwolame.la
 libgsttwolame_la_SOURCES = gsttwolamemp2enc.c
-libgsttwolame_la_CFLAGS = -DGST_USE_UNSTABLE_API \
+libgsttwolame_la_CFLAGS = \
 	$(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(TWOLAME_CFLAGS)
 
 libgsttwolame_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \