# HG changeset patch
# User nicodvb
# Date 1142546184 0
# Node ID 8dd9503e4d19b6d56cf5f35c4a037cc0a5f2c223
# Parent  76b492415fd6f92389b87856bd097d0ffff2ebb8
compile in the filters that depend on libavcodec/dsputil.h only when mplayer is configured to use the imported libavcodec

diff -r 76b492415fd6 -r 8dd9503e4d19 configure
--- a/configure	Thu Mar 16 19:16:07 2006 +0000
+++ b/configure	Thu Mar 16 21:56:24 2006 +0000
@@ -6165,8 +6165,10 @@
 
 _def_libavcodec='#undef USE_LIBAVCODEC'
 _def_libavcodec_so='#undef USE_LIBAVCODEC_SO'
+_def_lavc_dsputil='#undef USE_LIBAVCODEC_DSPUTIL'
 if test "$_libavcodec" = yes ; then
   _def_libavcodec='#define USE_LIBAVCODEC 1'
+  _def_lavc_dsputil='#define USE_LIBAVCODEC_DSPUTIL'
   _ld_libavcodec='libavcodec/libavcodec.a'
   _dep_libavcodec='libavcodec/libavcodec.a'
   _codecmodules="libavcodec $_codecmodules"
@@ -7719,6 +7721,7 @@
 /* ffmpeg's libavcodec support (requires libavcodec source) */
 $_def_libavcodec
 $_def_libavcodec_so
+$_def_lavc_dsputil
 
 /* ffmpeg's libavformat support (requires libavformat source) */
 $_def_libavformat
diff -r 76b492415fd6 -r 8dd9503e4d19 libmpcodecs/Makefile
--- a/libmpcodecs/Makefile	Thu Mar 16 19:16:07 2006 +0000
+++ b/libmpcodecs/Makefile	Thu Mar 16 21:56:24 2006 +0000
@@ -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)
diff -r 76b492415fd6 -r 8dd9503e4d19 libmpcodecs/vf.c
--- a/libmpcodecs/vf.c	Thu Mar 16 19:16:07 2006 +0000
+++ b/libmpcodecs/vf.c	Thu Mar 16 21:56:24 2006 +0000
@@ -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,