RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-27 13:49:33 +00:00
Code Issues Releases Wiki Activity

build: enable vf_geq if libavutil version installs eval.h

Browse Source 
New enough libavutil versions allow building vf_geq.c without
requiring internal FFmpeg headers.
This commit is contained in:
Uoti Urpala 2010-11-06 20:02:44 +02:00
parent b04c615959
commit d707da9e65
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -112,6 +112,9 @@ SRCS_COMMON-$(FFMPEG) += libmpcodecs/vf_pp.c \
libmpdemux/demux_lavf.c \ libmpdemux/demux_lavf.c \
stream/stream_ffmpeg.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. # These filters use private headers and do not work with shared libavcodec.
SRCS_COMMON-$(FFMPEG_INTERNALS) += libmpcodecs/vf_fspp.c \ SRCS_COMMON-$(FFMPEG_INTERNALS) += libmpcodecs/vf_fspp.c \
libmpcodecs/vf_geq.c \ libmpcodecs/vf_geq.c \

8
configure vendored
View File

@ -6516,9 +6516,15 @@ if test "$ffmpeg" = auto ; then
fi fi
fi fi
ffmpeg_eval_api=no
def_ffmpeg_eval_api="#undef CONFIG_FFMPEG_EVAL_API"
if test "$ffmpeg" = yes; then if test "$ffmpeg" = yes; then
def_ffmpeg='#define CONFIG_FFMPEG 1' def_ffmpeg='#define CONFIG_FFMPEG 1'
codecmodules="ffmpeg $codecmodules" 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 else
def_ffmpeg='#undef CONFIG_FFMPEG' def_ffmpeg='#undef CONFIG_FFMPEG'
nocodecmodules="ffmpeg $nocodecmodules" nocodecmodules="ffmpeg $nocodecmodules"
@ -7483,6 +7489,7 @@ ZR = $_zr
# FFmpeg # FFmpeg
FFMPEG = $ffmpeg FFMPEG = $ffmpeg
FFMPEG_EVAL_API = $ffmpeg_eval_api
FFMPEG_INTERNALS = $ffmpeg_internals FFMPEG_INTERNALS = $ffmpeg_internals
FFMPEG_SOURCE_PATH = $_ffmpeg_source FFMPEG_SOURCE_PATH = $_ffmpeg_source
@ -7895,6 +7902,7 @@ $def_zr
/* FFmpeg */ /* FFmpeg */
$def_ffmpeg $def_ffmpeg
$def_ffmpeg_eval_api
$def_ffmpeg_internals $def_ffmpeg_internals
#define CONFIG_DECODERS 1 #define CONFIG_DECODERS 1

2
libmpcodecs/vf.c
View File

@ -192,6 +192,8 @@ static const vf_info_t* const filter_list[]={
&vf_info_fspp, &vf_info_fspp,
&vf_info_qp, &vf_info_qp,
&vf_info_mcdeint, &vf_info_mcdeint,
#endif
#ifdef CONFIG_FFMPEG_EVAL_API
&vf_info_geq, &vf_info_geq,
#endif #endif
&vf_info_yuvcsp, &vf_info_yuvcsp,