diff options
| author | Dave Robillard <dave@drobilla.net> | 2009-06-19 21:01:54 -0400 |
|---|---|---|
| committer | Dave Robillard <dave@drobilla.net> | 2009-06-19 21:01:54 -0400 |
| commit | 925e83ee60c5406b2e5f0f39b0da0f90370efc27 (patch) | |
| tree | ce01d298ed0c5d31853fa43aedc2af0779417816 /ext/Makefile.am | |
| parent | 7f3bcd484b465d8216ac419754450adf07e9b0d2 (diff) | |
| parent | c70dbe94b5ff9a0993d852605d40c21020c59552 (diff) | |
| download | gst-plugins-bad-925e83ee60c5406b2e5f0f39b0da0f90370efc27.tar.gz gst-plugins-bad-925e83ee60c5406b2e5f0f39b0da0f90370efc27.tar.bz2 gst-plugins-bad-925e83ee60c5406b2e5f0f39b0da0f90370efc27.zip | |
Merge branch 'master' of git://anongit.freedesktop.org/gstreamer/gst-plugins-bad into fdo
Diffstat (limited to 'ext/Makefile.am')
| -rw-r--r-- | ext/Makefile.am | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/ext/Makefile.am b/ext/Makefile.am index 4576ec7b..8d395057 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -318,12 +318,6 @@ endif TARKIN_DIR= # endif -if USE_X264 -X264_DIR=x264 -else -X264_DIR= -endif - # if USE_XINE # XINE_DIR=xine # else @@ -389,7 +383,6 @@ SUBDIRS=\ $(TARKIN_DIR) \ $(THEORA_DIR) \ $(TIMIDITY_DIR) \ - $(X264_DIR) \ $(XINE_DIR) \ $(XVID_DIR) @@ -433,5 +426,4 @@ DIST_SUBDIRS = \ swfdec \ theora \ timidity \ - x264 \ xvid |