summaryrefslogtreecommitdiff
path: root/gst-libs/ext
diff options
context:
space:
mode:
authorBenjamin Otte <otte@gnome.org>2003-09-27 16:44:53 +0000
committerBenjamin Otte <otte@gnome.org>2003-09-27 16:44:53 +0000
commit4258cd6910edd87fce34377cd78472f5d019c063 (patch)
treea87cda30ae2d8eb24c30169075c74f1e5556ca11 /gst-libs/ext
parent05fe14304989a3fd97e069f7ce744f03b2edbf86 (diff)
make ffmpeg erroring out work:
Original commit message from CVS: make ffmpeg erroring out work: - don't built gst-libs/ext/ffmpeg - don't update Tag when cvs command fails
Diffstat (limited to 'gst-libs/ext')
-rw-r--r--gst-libs/ext/Makefile.am8
1 files changed, 7 insertions, 1 deletions
diff --git a/gst-libs/ext/Makefile.am b/gst-libs/ext/Makefile.am
index 7271132c6..587ac143a 100644
--- a/gst-libs/ext/Makefile.am
+++ b/gst-libs/ext/Makefile.am
@@ -1,3 +1,9 @@
-SUBDIRS = ffmpeg mplex
+if USE_FFMPEG
+FFMPEG_DIR=ffmpeg
+else
+FFMPEG_DIR=
+endif
+
+SUBDIRS = $(FFMPEG_DIR) mplex
DIST_SUBDIRS= ffmpeg mplex