mirror of https://github.com/mpv-player/mpv
build: enable vf_geq if libavutil version installs eval.h
New enough libavutil versions allow building vf_geq.c without requiring internal FFmpeg headers.
This commit is contained in:
parent
b04c615959
commit
d707da9e65
3
Makefile
3
Makefile
|
@ -112,6 +112,9 @@ SRCS_COMMON-$(FFMPEG) += libmpcodecs/vf_pp.c \
|
|||
libmpdemux/demux_lavf.c \
|
||||
stream/stream_ffmpeg.c \
|
||||
|
||||
# Requires a new enough libavutil that installs eval.h
|
||||
SRCS_COMMON-$(FFMPEG_EVAL_API) += libmpcodecs/vf_geq.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 \
|
||||
|
|
|
@ -6516,9 +6516,15 @@ if test "$ffmpeg" = auto ; then
|
|||
fi
|
||||
fi
|
||||
|
||||
ffmpeg_eval_api=no
|
||||
def_ffmpeg_eval_api="#undef CONFIG_FFMPEG_EVAL_API"
|
||||
if test "$ffmpeg" = yes; then
|
||||
def_ffmpeg='#define CONFIG_FFMPEG 1'
|
||||
codecmodules="ffmpeg $codecmodules"
|
||||
if $_pkg_config --atleast-version=50.18.0 libavutil ; then
|
||||
ffmpeg_eval_api=yes
|
||||
def_ffmpeg_eval_api="#define CONFIG_FFMPEG_EVAL_API 1"
|
||||
fi
|
||||
else
|
||||
def_ffmpeg='#undef CONFIG_FFMPEG'
|
||||
nocodecmodules="ffmpeg $nocodecmodules"
|
||||
|
@ -7483,6 +7489,7 @@ ZR = $_zr
|
|||
|
||||
# FFmpeg
|
||||
FFMPEG = $ffmpeg
|
||||
FFMPEG_EVAL_API = $ffmpeg_eval_api
|
||||
FFMPEG_INTERNALS = $ffmpeg_internals
|
||||
FFMPEG_SOURCE_PATH = $_ffmpeg_source
|
||||
|
||||
|
@ -7895,6 +7902,7 @@ $def_zr
|
|||
|
||||
/* FFmpeg */
|
||||
$def_ffmpeg
|
||||
$def_ffmpeg_eval_api
|
||||
$def_ffmpeg_internals
|
||||
|
||||
#define CONFIG_DECODERS 1
|
||||
|
|
|
@ -192,6 +192,8 @@ static const vf_info_t* const filter_list[]={
|
|||
&vf_info_fspp,
|
||||
&vf_info_qp,
|
||||
&vf_info_mcdeint,
|
||||
#endif
|
||||
#ifdef CONFIG_FFMPEG_EVAL_API
|
||||
&vf_info_geq,
|
||||
#endif
|
||||
&vf_info_yuvcsp,
|
||||
|
|
Loading…
Reference in New Issue