[MPlayer-cvslog] CVS: main/libaf Makefile, 1.28, 1.29 af_lavcresample.c, 1.11, 1.12

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main/libaf
In directory mail:/var2/tmp/cvs-serv5663

Modified Files:
	Makefile af_lavcresample.c 
Log Message:
Move conditional compilation out of the code and into the build system.


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libaf/Makefile,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Makefile	27 Jan 2006 00:06:37 -0000	1.28
+++ Makefile	31 Jan 2006 23:24:08 -0000	1.29
@@ -14,7 +14,6 @@
      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 @@
 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)

Index: af_lavcresample.c
===================================================================
RCS file: /cvsroot/mplayer/main/libaf/af_lavcresample.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- af_lavcresample.c	13 Nov 2005 18:28:44 -0000	1.11
+++ af_lavcresample.c	31 Jan 2006 23:24:08 -0000	1.12
@@ -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_FLAGS_REENTRANT,
   open
 };
-#endif