RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-04 23:40:47 +00:00
Code Issues Releases Wiki Activity

Move Zoran video controller check after the libavcodec one.

Browse Source 
As _libavcodec_a is set to "auto" the zoran check used to always fail.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25836 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
iive 2008-01-23 14:08:59 +00:00
parent 57d162c7a5
commit 41c2d2cb15
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
configure vendored
View File

@ -4557,31 +4557,6 @@ else
fi fi
echocheck "zr"
if test "$_zr" = auto ; then
#36067's seem to identify themselves as 36057PQC's, so the line
#below should work for 36067's and 36057's.
if grep -e "Multimedia video controller: Zoran Corporation ZR36057" /proc/pci > /dev/null 2>&1; then
_zr=yes
else
_zr=no
fi
fi
if test "$_zr" = yes ; then
if test "$_libavcodec_a" = yes ; then
_def_zr='#define HAVE_ZR 1'
_vosrc="$_vosrc vo_zr2.c vo_zr.c jpeg_enc.c"
_vomodules="zr zr2 $_vomodules"
else
_res_comment="libavcodec (static) is required by zr, sorry"
_novomodules="zr $_novomodules"
_def_zr='#undef HAVE_ZR'
fi
else
_def_zr='#undef HAVE_ZR'
_novomodules="zr zr2 $_novomodules"
fi
echores "$_zr"
echocheck "PNG support" echocheck "PNG support"
@ -6671,6 +6646,32 @@ else
fi fi
echores "$_libnut" echores "$_libnut"
#check must be done after libavcodec one
echocheck "zr"
if test "$_zr" = auto ; then
#36067's seem to identify themselves as 36057PQC's, so the line
#below should work for 36067's and 36057's.
if grep -e "Multimedia video controller: Zoran Corporation ZR36057" /proc/pci > /dev/null 2>&1; then
_zr=yes
else
_zr=no
fi
fi
if test "$_zr" = yes ; then
if test "$_libavcodec_a" = yes ; then
_def_zr='#define HAVE_ZR 1'
_vosrc="$_vosrc vo_zr2.c vo_zr.c jpeg_enc.c"
_vomodules="zr zr2 $_vomodules"
else
_res_comment="libavcodec (static) is required by zr, sorry"
_novomodules="zr $_novomodules"
_def_zr='#undef HAVE_ZR'
fi
else
_def_zr='#undef HAVE_ZR'
_novomodules="zr zr2 $_novomodules"
fi
echores "$_zr"
# mencoder requires (optional) those libs: libmp3lame # mencoder requires (optional) those libs: libmp3lame
if test "$_mencoder" != no ; then if test "$_mencoder" != no ; then