configure.ac: Call ffmpeg's configure with --disable-v4l,

Original commit message from CVS:
* configure.ac:  Call ffmpeg's configure with --disable-v4l,
--disable-oss-audio, --disable-dv1394 (bug #127873)

diff --git a/ChangeLog b/ChangeLog
index b079a8d..622dd15 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-05  David Schleef  <ds@schleef.org>
+
+       * configure.ac:  Call ffmpeg's configure with --disable-v4l,
+       --disable-oss-audio, --disable-dv1394 (bug #127873)
+
 2004-03-04  Ronald Bultje  <rbultje@ronald.bitfreak.net>
 
        * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_formatid_to_caps):

diff --git a/common b/common
index 874dab5..4eb0271 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 874dab5c3461ad7487f1ae029256b6da82dddf6d
+Subproject commit 4eb02711e49a6aadf900d6fd9d220c17115fec2a

diff --git a/configure.ac b/configure.ac
index 12e03a4..72d62fd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -114,6 +114,7 @@ dnl ###########################
 dnl # Configure external libs #
 dnl ###########################
 if test "x$HAVE_FFMPEG" = "xyes"; then
+  ac_configure_args="$ac_configure_args --disable-v4l --disable-audio-oss --disable-dv1394"
   AC_CONFIG_SUBDIRS(gst-libs/ext/ffmpeg/ffmpeg)
 fi