mirror of
https://github.com/mpv-player/mpv
synced 2024-12-15 03:15:52 +00:00
Fix codec directory fallback, it was overriding the autodetection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20570 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
d1ab80e8da
commit
8a041b9ea1
19
configure
vendored
19
configure
vendored
@ -5972,10 +5972,12 @@ if test "$_win32" = auto ; then
|
||||
break;
|
||||
fi;
|
||||
done
|
||||
_win32codecsdir="$_codecsdir"
|
||||
# Fall back on a subfolder of the current dir on Windows
|
||||
mingw32 && _win32codecsdir="codecs"
|
||||
fi
|
||||
# Fall back on default directory.
|
||||
if test -z "$_win32codecsdir" ; then
|
||||
_win32codecsdir="$_codecsdir"
|
||||
mingw32 && _win32codecsdir="codecs"
|
||||
fi
|
||||
fi
|
||||
|
||||
echocheck "Win32 codec DLL support"
|
||||
@ -6027,6 +6029,9 @@ if test "$_xanim" = auto ; then
|
||||
break;
|
||||
fi;
|
||||
done
|
||||
fi
|
||||
# Fall back on default directory.
|
||||
if test -z "$_xanimcodecsdir" ; then
|
||||
_xanimcodecsdir="$_codecsdir"
|
||||
fi
|
||||
test "$_xanimcodecsdir" && _xanim=yes
|
||||
@ -6063,11 +6068,13 @@ if test "$_real" = auto ; then
|
||||
_realcodecsdir="$I"
|
||||
break
|
||||
fi
|
||||
_realcodecsdir="$_codecsdir"
|
||||
# Fall back on a subfolder of the current dir on Windows
|
||||
mingw32 && _realcodecsdir="codecs"
|
||||
done
|
||||
fi
|
||||
# Fall back on default directory.
|
||||
if test -z "$_realcodecsdir" ; then
|
||||
_realcodecsdir="$_codecsdir"
|
||||
mingw32 && _realcodecsdir="codecs"
|
||||
fi
|
||||
test "$_realcodecsdir" && _real=yes
|
||||
fi
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user