summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HACKING1
-rw-r--r--configure.ac2
2 files changed, 2 insertions, 1 deletions
diff --git a/HACKING b/HACKING
index 40c14d2..d8e1f5a 100644
--- a/HACKING
+++ b/HACKING
@@ -48,6 +48,7 @@ THE WAY
- cvs add .pc/(patchsetname)/(file)
- cvs commit .pc/(patchsetname) (to update the state of quilt in cvs)
- edit the file
+ - cvs add the file if it doesn't exist yet
- quilt refresh
- quilt push -a (This one is IMPORTANT, otherwise you'll have a huge diff)
- cvs commit
diff --git a/configure.ac b/configure.ac
index a98f88d..84172ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,7 +87,7 @@ dnl ###########################
AC_DEFINE_UNQUOTED(HAVE_FFMPEG_UNINSTALLED, 1,
[Defined if building against uninstalled FFmpeg source])
-ac_configure_args="$ac_configure_args --disable-v4l --disable-audio-oss --disable-dv1394 --disable-vhook --disable-ffmpeg --disable-ffplay --disable-ffserver"
+ac_configure_args="$ac_configure_args --disable-v4l --disable-audio-oss --disable-dv1394 --disable-vhook --disable-ffmpeg --disable-ffserver"
AC_CONFIG_SUBDIRS(gst-libs/ext/ffmpeg)
AC_CONFIG_FILES(