[MPlayer-cvslog] CVS: main/libmpcodecs Makefile, 1.160, 1.161 vf.c, 1.123, 1.124

[Nico Sabbi CVS]

CVS change done by Nico Sabbi CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv30921/libmpcodecs

Modified Files:
	Makefile vf.c 
Log Message:
compile in the filters that depend on libavcodec/dsputil.h only when mplayer is configured to use the imported libavcodec

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/Makefile,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- Makefile	31 Jan 2006 23:45:46 -0000	1.160
+++ Makefile	16 Mar 2006 21:56:23 -0000	1.161
@@ -150,12 +150,13 @@
              vf_yvu9.c \
              vf_screenshot.c \
 
-VFILTER_LAVC_SRCS += vf_uspp.c \
-                     vf_fspp.c \
-                     vf_lavc.c \
+VFILTER_LAVC_SRCS += vf_lavc.c \
                      vf_lavcdeint.c \
-                     vf_qp.c \
-                     vf_spp.c \
+
+VFILTER_LAVC_DSPUTIL_SRCS += vf_uspp.c \
+                             vf_fspp.c \
+                             vf_qp.c \
+                             vf_spp.c \
 
 ifeq ($(CONFIG_LIBPOSTPROC),yes)
 VFILTER_SRCS += vf_pp.c
@@ -166,6 +167,7 @@
 
 ifeq ($(CONFIG_LIBAVCODEC),yes)
 VFILTER_SRCS += $(VFILTER_LAVC_SRCS)
+VFILTER_SRCS += $(VFILTER_LAVC_DSPUTIL_SRCS)
 endif
 ifeq ($(CONFIG_LIBAVCODEC_SO),yes)
 VFILTER_SRCS += $(VFILTER_LAVC_SRCS)

Index: vf.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- vf.c	9 Feb 2006 14:07:55 -0000	1.123
+++ vf.c	16 Mar 2006 21:56:24 -0000	1.124
@@ -172,17 +172,17 @@
     &vf_info_delogo,
     &vf_info_remove_logo,
     &vf_info_hue,
-#ifdef USE_LIBAVCODEC
+#ifdef USE_LIBAVCODEC_DSPUTIL
     &vf_info_spp,
     &vf_info_uspp,
     &vf_info_fspp,
-    &vf_info_pp7,
+    &vf_info_qp,
 #endif
     &vf_info_yuvcsp,
     &vf_info_kerndeint,
     &vf_info_rgbtest,
 #ifdef USE_LIBAVCODEC
-    &vf_info_qp,
+    &vf_info_pp7,
 #endif
     &vf_info_phase,
     &vf_info_divtc,