summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2011-12-22 01:07:12 +0200
committerUoti Urpala <uau@mplayer2.org>2011-12-22 01:27:45 +0200
commit37e4a928ca78bad9ea5e7ec07c0561c511de8ac9 (patch)
tree88386fbcdd4013407666505638038066a1228784 /Makefile
parent803dc1fb8ac29666c492bd45f6b2568d19167ef4 (diff)
downloadmpv-37e4a928ca78bad9ea5e7ec07c0561c511de8ac9.tar.bz2
mpv-37e4a928ca78bad9ea5e7ec07c0561c511de8ac9.tar.xz
configure, build: require at least Libav 0.7
Require versions of the Libav libraries corresponding to Libav release 0.7. These are: libavutil 51.7.0 libavcodec 53.5.0 libavformat 53.2.0 libswscale 2.0.0 libpostproc 52.0.0 Also disable the fallback to simple header check if these libraries could not be found with pkg-config; now compiling without pkg-config support for these always requires explicitly setting --enable-libav and any needed compiler/linker flags. The simple check would have let compilation proceed even if a version mismatch was detected.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 2 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 8cb43cb50a..c92079d9e4 100644
--- a/Makefile
+++ b/Makefile
@@ -60,10 +60,6 @@ SRCS_COMMON-$(DVDREAD_INTERNAL) += libdvdread4/bitreader.c \
SRCS_COMMON-$(FAAD) += libmpcodecs/ad_faad.c
SRCS_COMMON-$(FASTMEMCPY) += libvo/aclib.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_mcdeint.c \
@@ -316,6 +312,7 @@ SRCS_COMMON = asxparser.c \
libmpcodecs/vf_flip.c \
libmpcodecs/vf_format.c \
libmpcodecs/vf_framestep.c \
+ libmpcodecs/vf_geq.c \
libmpcodecs/vf_gradfun.c \
libmpcodecs/vf_halfpack.c \
libmpcodecs/vf_harddup.c \
@@ -337,6 +334,7 @@ SRCS_COMMON = asxparser.c \
libmpcodecs/vf_pp.c \
libmpcodecs/vf_pp7.c \
libmpcodecs/vf_pullup.c \
+ libmpcodecs/vf_qp.c \
libmpcodecs/vf_rectangle.c \
libmpcodecs/vf_remove_logo.c \
libmpcodecs/vf_rgbtest.c \