mirror of
https://github.com/mpv-player/mpv.git
synced 2024-09-20 12:02:23 +02:00
disable mp1e if no dxr3 or no mmx
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3854 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
5e40a0ee4c
commit
6366d875d3
41
configure
vendored
41
configure
vendored
@ -649,7 +649,7 @@ _prefix="/usr/local"
|
|||||||
# If autodetection is available then the third state is: auto
|
# If autodetection is available then the third state is: auto
|
||||||
_libavcodec=auto
|
_libavcodec=auto
|
||||||
_libavcodecso=no # changed default to no as it causes problems - atmos
|
_libavcodecso=no # changed default to no as it causes problems - atmos
|
||||||
_mp1e=yes
|
_mp1e=auto
|
||||||
_mencoder=auto
|
_mencoder=auto
|
||||||
_x11=auto
|
_x11=auto
|
||||||
_dga=auto # 1 2 no auto
|
_dga=auto # 1 2 no auto
|
||||||
@ -745,6 +745,7 @@ for ac_option do
|
|||||||
--disable-iconv) _iconv=no ;;
|
--disable-iconv) _iconv=no ;;
|
||||||
--enable-rtc) _rtc=yes ;;
|
--enable-rtc) _rtc=yes ;;
|
||||||
--disable-rtc) _rtc=no ;;
|
--disable-rtc) _rtc=no ;;
|
||||||
|
--enable-mp1e) _mp1e=yes ;;
|
||||||
--disable-mp1e) _mp1e=no ;;
|
--disable-mp1e) _mp1e=no ;;
|
||||||
--enable-ossaudio) _ossaudio=yes ;;
|
--enable-ossaudio) _ossaudio=yes ;;
|
||||||
--disable-ossaudio) _ossaudio=no ;;
|
--disable-ossaudio) _ossaudio=no ;;
|
||||||
@ -1834,23 +1835,6 @@ else
|
|||||||
fi
|
fi
|
||||||
echores "$_nas"
|
echores "$_nas"
|
||||||
|
|
||||||
# libmp1e's audio encoder is failing under QNX
|
|
||||||
if test "$_mmx" = no || qnx ; then
|
|
||||||
_mp1e=no
|
|
||||||
fi
|
|
||||||
if test "$_mp1e" = yes ; then
|
|
||||||
_def_mp1e='#define USE_MP1E'
|
|
||||||
_ld_mp1e="-Llibmp1e -lmp1e"
|
|
||||||
_dep_mp1e='libmp1e/libmp1e.a'
|
|
||||||
else
|
|
||||||
echocheck "libmp1e"
|
|
||||||
_mp1e=no
|
|
||||||
_def_mp1e='#undef USE_MP1E'
|
|
||||||
_ld_mp1e=""
|
|
||||||
_dep_mp1e=''
|
|
||||||
echores "$_mp1e"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echocheck "DXR3/H+"
|
echocheck "DXR3/H+"
|
||||||
if test "$_dxr3" = auto ; then
|
if test "$_dxr3" = auto ; then
|
||||||
cat > $TMPC << EOF
|
cat > $TMPC << EOF
|
||||||
@ -1868,9 +1852,30 @@ if test "$_dxr3" = yes ; then
|
|||||||
_aomodules="dxr3 $_aomodules"
|
_aomodules="dxr3 $_aomodules"
|
||||||
else
|
else
|
||||||
_def_dxr3='#undef HAVE_DXR3'
|
_def_dxr3='#undef HAVE_DXR3'
|
||||||
|
if test "$_mp1e" = auto ; then
|
||||||
|
# we don't need mp1e
|
||||||
|
_mp1e=no
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
echores "$_dxr3"
|
echores "$_dxr3"
|
||||||
|
|
||||||
|
echocheck "libmp1e"
|
||||||
|
if test "$_mmx" = no ; then
|
||||||
|
# mp1e REQUIRES mmx!
|
||||||
|
_mp1e=no
|
||||||
|
fi
|
||||||
|
if test "$_mp1e" != no ; then
|
||||||
|
_mp1e=yes
|
||||||
|
_def_mp1e='#define USE_MP1E'
|
||||||
|
_ld_mp1e="-Llibmp1e -lmp1e"
|
||||||
|
_dep_mp1e='libmp1e/libmp1e.a'
|
||||||
|
else
|
||||||
|
_mp1e=no
|
||||||
|
_def_mp1e='#undef USE_MP1E'
|
||||||
|
_ld_mp1e=""
|
||||||
|
_dep_mp1e=''
|
||||||
|
fi
|
||||||
|
echores "$_mp1e"
|
||||||
|
|
||||||
#########
|
#########
|
||||||
# AUDIO #
|
# AUDIO #
|
||||||
|
Loading…
Reference in New Issue
Block a user