summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorJan Schmidt <thaytan@noraisin.net>2009-06-05 19:25:54 +0100
committerJan Schmidt <thaytan@noraisin.net>2009-06-05 19:25:54 +0100
commit5e176f4b0c3795d6b403fbb8dd5a040f2e9c1a18 (patch)
tree91eca22552459487a74e03fed12561b59cc6293f /ext
parent0823e9fa148375a5215f820a4a036ef952c50b2d (diff)
Moved 'x264enc' from -bad to -ugly
Diffstat (limited to 'ext')
-rw-r--r--ext/Makefile.am12
1 files changed, 10 insertions, 2 deletions
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 6634c1b8..6b2f7e1c 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -58,6 +58,12 @@ else
TWOLAME_DIR =
endif
+if USE_X264
+X264_DIR=x264
+else
+X264_DIR=
+endif
+
SUBDIRS = \
$(A52DEC_DIR) \
$(AMRNB_DIR) \
@@ -68,7 +74,8 @@ SUBDIRS = \
$(MAD_DIR) \
$(MPEG2DEC_DIR) \
$(SIDPLAY_DIR) \
- $(TWOLAME_DIR)
+ $(TWOLAME_DIR) \
+ $(X264_DIR)
DIST_SUBDIRS = \
a52dec \
@@ -80,4 +87,5 @@ DIST_SUBDIRS = \
mad \
mpeg2dec \
sidplay \
- twolame
+ twolame \
+ x264