summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2011-07-18 00:15:08 +0300
committerUoti Urpala <uau@mplayer2.org>2011-07-18 00:57:05 +0300
commit4e2b15fc5e5f457f62605262a46962b5fd63ff99 (patch)
tree5156034070257cf3652040facf3a8de9453477ec /Makefile
parent25de40142507eadb8b2e958346999eb52ed7f9fd (diff)
downloadmpv-4e2b15fc5e5f457f62605262a46962b5fd63ff99.tar.bz2
mpv-4e2b15fc5e5f457f62605262a46962b5fd63ff99.tar.xz
vf_qp: enable compilation depending on libavutil eval API
Libavutil eval API seems to be enough for vf_qp, so enable the filter if the API is available. Also clean up some left over lines for other filters in Makefile.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 2 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 5a3157796e..b3c082a8b6 100644
--- a/Makefile
+++ b/Makefile
@@ -75,12 +75,11 @@ SRCS_COMMON-$(FFMPEG) += libmpcodecs/vf_pp.c \
# Requires a new enough libavutil that installs eval.h
SRCS_COMMON-$(FFMPEG_EVAL_API) += libmpcodecs/vf_geq.c \
+ libmpcodecs/vf_qp.c \
# These filters use private headers and do not work with shared libavcodec.
SRCS_COMMON-$(FFMPEG_INTERNALS) += libmpcodecs/vf_fspp.c \
- libmpcodecs/vf_geq.c \
libmpcodecs/vf_mcdeint.c \
- libmpcodecs/vf_qp.c \
libmpcodecs/vf_spp.c \
SRCS_COMMON-$(FREETYPE) += sub/font_load_ft.c
@@ -654,11 +653,8 @@ checkheaders: $(ALLHEADERS:.h=.ho)
codec-cfg.o: codecs.conf.h
mpcommon.o osdep/mplayer-rc.o: version.h
-# Files that depend on libswscale internals
-libmpcodecs/vf_palette.o: CFLAGS := -I$(FFMPEG_SOURCE_PATH) $(CFLAGS)
-
# Files that depend on libavcodec internals
-libmpcodecs/vf_fspp.o libmpcodecs/vf_geq.o libmpcodecs/vf_mcdeint.o libmpcodecs/vf_qp.o libmpcodecs/vf_spp.o libvo/jpeg_enc.o: CFLAGS := -I$(FFMPEG_SOURCE_PATH) $(CFLAGS)
+libmpcodecs/vf_fspp.o libmpcodecs/vf_mcdeint.o libmpcodecs/vf_spp.o: CFLAGS := -I$(FFMPEG_SOURCE_PATH) $(CFLAGS)
osdep/mplayer-rc.o: osdep/mplayer.exe.manifest