Mercurial > mplayer.hg

changeset 17522:2408715522a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move conditional compilation out of the code and into the build system.
author diego
date Tue, 31 Jan 2006 23:24:08 +0000
parents 6090c379d49c
children f0e7712385dc
files libaf/Makefile libaf/af_lavcresample.c
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libaf/Makefile	Tue Jan 31 10:28:20 2006 +0000
+++ b/libaf/Makefile	Tue Jan 31 23:24:08 2006 +0000
@@ -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)
--- a/libaf/af_lavcresample.c	Tue Jan 31 10:28:20 2006 +0000
+++ b/libaf/af_lavcresample.c	Tue Jan 31 23:24:08 2006 +0000
@@ -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