diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-01-31 23:24:08 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-01-31 23:24:08 +0000 |
| commit | 8c317f72a7741b180dfa4bd693cfa1b54e8345a7 (patch) | |
| tree | 9efcfbb6155295acc6ae1832611c881e881c4a73 /libaf | |
| parent | dc7763a8e8a207e6c97d52d95f5a58941320a132 (diff) | |
| download | mpv-8c317f72a7741b180dfa4bd693cfa1b54e8345a7.tar.bz2 mpv-8c317f72a7741b180dfa4bd693cfa1b54e8345a7.tar.xz | |
Move conditional compilation out of the code and into the build system.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17523 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libaf')
| -rw-r--r-- | libaf/Makefile | 5 | ||||
| -rw-r--r-- | libaf/af_lavcresample.c | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libaf/Makefile b/libaf/Makefile index 26671d327a..8c72f4fec4 100644 --- a/libaf/Makefile +++ b/libaf/Makefile @@ -14,7 +14,6 @@ SRCS=af.c \ af_format.c \ af_gate.c \ af_hrtf.c \ - af_lavcresample.c \ af_pan.c \ af_resample.c \ af_sub.c \ @@ -34,6 +33,10 @@ LIBAV_INC += -I../libavutil endif ifeq ($(CONFIG_LIBAVCODEC),yes) LIBAV_INC += -I../libavcodec +SRCS+=af_lavcresample.c +endif +ifeq ($(CONFIG_LIBAVCODEC_SO),yes) +SRCS+=af_lavcresample.c endif OBJS=$(SRCS:.c=.o) diff --git a/libaf/af_lavcresample.c b/libaf/af_lavcresample.c index 0c92385c91..c988aa671a 100644 --- a/libaf/af_lavcresample.c +++ b/libaf/af_lavcresample.c @@ -9,8 +9,6 @@ #include "config.h" #include "af.h" -#ifdef USE_LIBAVCODEC - #ifdef USE_LIBAVCODEC_SO #include <ffmpeg/avcodec.h> #include <ffmpeg/rational.h> @@ -188,4 +186,3 @@ af_info_t af_info_lavcresample = { AF_FLAGS_REENTRANT, open }; -#endif |