diff options
| author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-03-16 21:56:24 +0000 |
|---|---|---|
| committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-03-16 21:56:24 +0000 |
| commit | 81472a14a749a9088581603f4eb6b8623544b84a (patch) | |
| tree | 279940ed80299f14713f53459d070a491e013bcb | |
| parent | b27336b6d248c6705f6b693f86c245ff7b5a9717 (diff) | |
| download | mpv-81472a14a749a9088581603f4eb6b8623544b84a.tar.bz2 mpv-81472a14a749a9088581603f4eb6b8623544b84a.tar.xz | |
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
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | libmpcodecs/Makefile | 12 | ||||
| -rw-r--r-- | libmpcodecs/vf.c | 6 |
3 files changed, 13 insertions, 8 deletions
@@ -6165,8 +6165,10 @@ fi _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 @@ $_def_win32_loader /* 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 --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, |