mirror of
https://github.com/mpv-player/mpv
synced 2025-03-25 04:38:01 +00:00
Merge static and shared libpostproc checks.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23125 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
4dbffcb962
commit
60b90aa682
18
configure
vendored
18
configure
vendored
@ -6265,20 +6265,14 @@ _libavformat=no
|
||||
test "$_libavformat_a" = yes || test "$_libavformat_so" = yes && _libavformat=yes
|
||||
echores "$_libavformat"
|
||||
|
||||
echocheck "FFmpeg libpostproc (static)"
|
||||
echocheck "FFmpeg libpostproc"
|
||||
if test "$_libpostproc_a" = auto ; then
|
||||
_libpostproc_a=no
|
||||
if test -d libpostproc && test -f libpostproc/postprocess.h ; then
|
||||
_libpostproc='yes'
|
||||
_libpostproc_a='yes'
|
||||
_res_comment="static"
|
||||
fi
|
||||
fi
|
||||
echores "$_libpostproc_a"
|
||||
|
||||
|
||||
if test "$_libpostproc_a" != yes ; then
|
||||
echocheck "FFmpeg libpostproc (dynamic)"
|
||||
if test "$_libpostproc_so" = auto ; then
|
||||
elif test "$_libpostproc_so" = auto ; then
|
||||
_libpostproc_so=no
|
||||
cat > $TMPC << EOF
|
||||
#define USE_LIBPOSTPROC 1
|
||||
@ -6290,13 +6284,13 @@ if test "$_libpostproc_so" = auto ; then
|
||||
EOF
|
||||
if cc_check -lpostproc $_ld_lm ; then
|
||||
_ld_extra="$_ld_extra -lpostproc"
|
||||
_libpostproc=yes
|
||||
_libpostproc_so=yes
|
||||
_res_comment="using libpostproc.so, but static libpostproc is recommended"
|
||||
fi
|
||||
fi
|
||||
echores "$_libpostproc_so"
|
||||
fi #if test "$_libpostproc" != yes ; then
|
||||
_libpostproc=no
|
||||
test "$_libpostproc_a" = yes || test "$_libpostproc_so" = yes && _libpostproc=yes
|
||||
echores "$_libpostproc"
|
||||
|
||||
_def_libavutil='#undef USE_LIBAVUTIL'
|
||||
_def_libavutil_so='#undef USE_LIBAVUTIL_SO'
|
||||
|
Loading…
Reference in New Issue
Block a user