diff options
| author | iive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-01-23 14:08:59 +0000 |
|---|---|---|
| committer | iive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-01-23 14:08:59 +0000 |
| commit | 41c2d2cb15db0f81cee2f02f6bef939a4526b7fe (patch) | |
| tree | 2f11dded88474442e91465ca202d0d725e788746 /configure | |
| parent | 57d162c7a5cf20ad977a705d35aded2ac7ffa30c (diff) | |
| download | mpv-41c2d2cb15db0f81cee2f02f6bef939a4526b7fe.tar.bz2 mpv-41c2d2cb15db0f81cee2f02f6bef939a4526b7fe.tar.xz | |
Move Zoran video controller check after the libavcodec one.
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
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 51 |
1 files changed, 26 insertions, 25 deletions
@@ -4557,31 +4557,6 @@ else 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" @@ -6671,6 +6646,32 @@ else fi 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 if test "$_mencoder" != no ; then |