diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-09 17:23:59 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-09 17:23:59 +0000 |
commit | 0ce6d08a83a95a64ad877e48a38c23426e915cf0 (patch) | |
tree | 911524df29ff5f4865bc01cda6b5fd380164cf63 | |
parent | 27d308ae44d6e45e33fc4db2a9e387f0abdcfef7 (diff) | |
download | mpv-0ce6d08a83a95a64ad877e48a38c23426e915cf0.tar.bz2 mpv-0ce6d08a83a95a64ad877e48a38c23426e915cf0.tar.xz |
Handle af_ladspa conditional compilation in the usual way.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26373 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-x | configure | 10 | ||||
-rw-r--r-- | libaf/Makefile | 2 |
2 files changed, 3 insertions, 9 deletions
@@ -6202,11 +6202,8 @@ EOF fi if test "$_ladspa" = yes; then _def_ladspa="#define HAVE_LADSPA" - _afsrc="$_afsrc af_ladspa.c" - _afmodules="ladspa $_afmodules" else _def_ladspa="#undef HAVE_LADSPA" - _noafmodules="ladspa $_noafmodules" fi echores "$_ladspa" @@ -7756,6 +7753,8 @@ ALSA5 = $_alsa5 ALSA9 = $_alsa9 ALSA1X = $_alsa1x +LADSPA = $_ladspa + # input/demuxer/codecs JOYSTICK = $_joystick LIRC = $_lirc @@ -7851,9 +7850,6 @@ VO_SRCS = $_vosrc # --- libao2 stuff --- AO_SRCS = $_aosrc -# --- libaf stuff --- -AF_SRCS = $_afsrc - # FFmpeg LIBAVUTIL = $_libavutil LIBAVUTIL_A = $_libavutil_a @@ -8686,13 +8682,11 @@ cat << EOF Codecs: $_codecmodules Audio output: $_aomodules Video output: $_vomodules - Audio filters: $_afmodules Disabled optional drivers: Input: $_noinputmodules Codecs: $_nocodecmodules Audio output: $_noaomodules Video output: $_novomodules - Audio filters: $_noafmodules 'config.h' and 'config.mak' contain your configuration options. Note: If you alter theses files (for instance CFLAGS) MPlayer may no longer diff --git a/libaf/Makefile b/libaf/Makefile index 902966b4d7..69cde10489 100644 --- a/libaf/Makefile +++ b/libaf/Makefile @@ -28,9 +28,9 @@ SRCS_COMMON = af.c \ format.c \ reorder_ch.c \ window.c \ - $(AF_SRCS) \ SRCS_COMMON-$(HAVE_SYS_MMAN_H) += af_export.c +SRCS_COMMON-$(LADSPA) += af_ladspa.c SRCS_COMMON-$(LIBAVCODEC) += af_lavcresample.c SRCS_COMMON-$(LIBAVCODEC_A) += af_lavcac3enc.c |