configure.ac: Fix indentation, fix v4l2 plugin detection.

Original commit message from CVS:
* configure.ac:
Fix indentation, fix v4l2 plugin detection.
* ext/Makefile.am:
Fix libmms location (Maciej, use diff -u!).
* ext/alsa/gstalsa.c: (gst_alsa_init):
Initialize caps cache to NULL.
* gst/playback/gstplaybin.c: (gst_play_bin_change_state):
Only change state on audiosink if it exists.

diff --git a/ChangeLog b/ChangeLog
index 102bc69..aaedb8a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-12-29  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+       * configure.ac:
+         Fix indentation, fix v4l2 plugin detection.
+       * ext/Makefile.am:
+         Fix libmms location (Maciej, use diff -u!).
+       * ext/alsa/gstalsa.c: (gst_alsa_init):
+         Initialize caps cache to NULL.
+       * gst/playback/gstplaybin.c: (gst_play_bin_change_state):
+         Only change state on audiosink if it exists.
+
 2004-12-28  Maciej Katafiasz  <mathrick@mathrick.org>
 
        * gst/matroska/matroska-demux.c:

diff --git a/configure.ac b/configure.ac
index 5f26385..a60ac4d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -411,7 +411,7 @@ GST_PLUGINS_ALL="\
        synaesthesia \
        tags \
        tcp \
-  tta \
+       tta \
        typefind \
        udp \
        vbidec \
@@ -688,6 +688,7 @@ GST_CHECK_FEATURE(GST_V4L, [Video 4 Linux], v4lsrc v4lmjpegsrc v4lmjpegsink, [
     AC_CHECK_DECL(VID_TYPE_MPEG_ENCODER, HAVE_GST_V4L="yes", HAVE_GST_V4L="no", [
 #include <sys/types.h>
 #define _LINUX_TIME_H
+#define __user
 #include <linux/videodev.h>
     ])
   fi
@@ -706,6 +707,7 @@ GST_CHECK_FEATURE(GST_V4L2, [Video 4 Linux 2], v4l2src, [
 #include <sys/types.h>
 #include <linux/types.h>
 #define _LINUX_TIME_H
+#define __user
 #include <linux/videodev2.h>
 #if defined(V4L2_MAJOR_VERSION) || defined(V4L2_MINOR_VERSION)
 #error too early v4l2 version or no v4l2 at all
@@ -727,6 +729,7 @@ return 0;
 #include <sys/types.h>
 #include <linux/types.h>
 #define _LINUX_TIME_H
+#define __user
 #include <linux/videodev2.h>
     ],[
 struct v4l2_buffer buf;
@@ -1437,8 +1440,6 @@ GST_CHECK_FEATURE(MUSEPACK, [musepackdec], musepack, [
   AC_CHECK_HEADER([musepack/mpc_dec.h], [
     HAVE_MUSEPACK="yes"
     MUSEPACK_LIBS="-lmusepack"
-    MUSEPACK_CFLAGS=
-    AC_SUBST(MUSEPACK_CFLAGS)
     AC_SUBST(MUSEPACK_LIBS)
     ], [HAVE_MUSEPACK="no"])
   AC_LANG_C

diff --git a/ext/Makefile.am b/ext/Makefile.am
index 6f57627..08c61fd 100644 (file)
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -479,7 +479,6 @@ DIST_SUBDIRS=\
        dvdread \
        dvdnav \
        esd \
-       libmms \
        faac \
        faad \
        flac \
@@ -496,6 +495,7 @@ DIST_SUBDIRS=\
        libcaca \
        libfame \
        libmng \
+       libmms \
        libpng \
        librfb \
        libvisual \

diff --git a/ext/alsa/gstalsa.c b/ext/alsa/gstalsa.c
index de01dce..e563f44 100644 (file)
--- a/ext/alsa/gstalsa.c
+++ b/ext/alsa/gstalsa.c
@@ -211,6 +211,7 @@ static void
 gst_alsa_init (GstAlsa * this)
 {
   this->device = g_strdup ("default");
+  this->cached_caps = NULL;
 
   GST_FLAG_SET (this, GST_ELEMENT_EVENT_AWARE);
   GST_FLAG_SET (this, GST_ELEMENT_THREAD_SUGGESTED);

diff --git a/gst/playback/gstplaybin.c b/gst/playback/gstplaybin.c
index 88dd263..8832308 100644 (file)
--- a/gst/playback/gstplaybin.c
+++ b/gst/playback/gstplaybin.c
@@ -790,7 +790,8 @@ gst_play_bin_change_state (GstElement * element)
     case GST_STATE_PLAYING_TO_PAUSED:
       /* Set audio sink state to NULL to release the sound device,
        * but only if we own it (else we might be in chain-transition). */
-      if (GST_STATE (play_bin->audio_sink) == GST_STATE_PAUSED) {
+      if (play_bin->audio_sink != NULL &&
+          GST_STATE (play_bin->audio_sink) == GST_STATE_PAUSED) {
         gst_element_set_state (play_bin->audio_sink, GST_STATE_NULL);
       }
       break;