summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-12-29 13:27:45 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-12-29 13:27:45 +0000
commitf27a1edb7c843a68549abc349b576db33b4f08d4 (patch)
treee96a2e562f76f7edeede44f6500bdb8e7917fc49
parent885b877b20522991aa9dbd33127a485628fe7046 (diff)
downloadgst-plugins-bad-f27a1edb7c843a68549abc349b576db33b4f08d4.tar.gz
gst-plugins-bad-f27a1edb7c843a68549abc349b576db33b4f08d4.tar.bz2
gst-plugins-bad-f27a1edb7c843a68549abc349b576db33b4f08d4.zip
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.
-rw-r--r--ChangeLog11
-rw-r--r--configure.ac7
-rw-r--r--ext/Makefile.am2
3 files changed, 16 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 102bc69b..aaedb8ac 100644
--- 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 5f263854..a60ac4d7 100644
--- 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 6f57627b..08c61fd1 100644
--- 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 \