From 81472a14a749a9088581603f4eb6b8623544b84a Mon Sep 17 00:00:00 2001
From: nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 16 Mar 2006 21:56:24 +0000
Subject: compile in the filters that depend on libavcodec/dsputil.h only when
 mplayer is configured to use the imported libavcodec

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17883 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpcodecs/Makefile | 12 +++++++-----
 libmpcodecs/vf.c     |  6 +++---
 2 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'libmpcodecs')

diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile
index 954ba40ab6..22f197570e 100644
--- a/libmpcodecs/Makefile
+++ b/libmpcodecs/Makefile
@@ -150,12 +150,13 @@ VFILTER_SRCS=vf.c \
              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 @@ endif
 
 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)
diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c
index 5781dbb0f8..c436547c46 100644
--- a/libmpcodecs/vf.c
+++ b/libmpcodecs/vf.c
@@ -172,17 +172,17 @@ static vf_info_t* filter_list[]={
     &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,
-- 
cgit v1.2.3