From 926a3caea29cbf928e971aa1399ed8d0ed83081c Mon Sep 17 00:00:00 2001 From: David Schleef Date: Sat, 6 Mar 2004 04:30:22 +0000 Subject: [PATCH] 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) --- ChangeLog | 5 +++++ common | 2 +- configure.ac | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b079a8d..622dd15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-03-05 David Schleef + + * configure.ac: Call ffmpeg's configure with --disable-v4l, + --disable-oss-audio, --disable-dv1394 (bug #127873) + 2004-03-04 Ronald Bultje * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_formatid_to_caps): diff --git a/common b/common index 874dab5..4eb0271 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 874dab5c3461ad7487f1ae029256b6da82dddf6d +Subproject commit 4eb02711e49a6aadf900d6fd9d220c17115fec2a diff --git a/configure.ac b/configure.ac index 12e03a4..72d62fd 100644 --- 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 -- 2.7.4