summaryrefslogtreecommitdiffstats
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
commitd79e4c6f8fb781c8e245aa463dee066aa879f53b (patch)
tree0ca53d4bc7f8a5b2d3ccf62fda0dc68456b09a6f /gst-libs/ext
parenta786b1cf96eb0b0fa078163db07f9ce2851ba7b0 (diff)
downloadgst-plugins-bad-d79e4c6f8fb781c8e245aa463dee066aa879f53b.tar.gz
gst-plugins-bad-d79e4c6f8fb781c8e245aa463dee066aa879f53b.tar.bz2
gst-plugins-bad-d79e4c6f8fb781c8e245aa463dee066aa879f53b.zip
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 7271132c..587ac143 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