Mercurial > mplayer.hg
changeset 27689:d6ae24838f0f
Disable mp3lib and liba52-internal for icc.
| author | cehoyos |
|---|---|
| date | Sun, 05 Oct 2008 20:43:09 +0000 |
| parents | 49d5420c5698 |
| children | 06d645ed0c9f |
| files | configure |
| diffstat | 1 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Sun Oct 05 16:47:55 2008 +0000 +++ b/configure Sun Oct 05 20:43:09 2008 +0000 @@ -320,7 +320,7 @@ --disable-twolame disable Twolame (MPEG layer 2) encoding [autodetect] --enable-xmms enable XMMS input plugin support [disabled] --enable-libdca enable libdca support [autodetect] - --disable-mp3lib disable builtin mp3lib [enabled] + --disable-mp3lib disable builtin mp3lib [autodetect] --disable-liba52 disable liba52 [autodetect] --disable-liba52-internal disable builtin liba52 [autodetect] --disable-libmpeg2 disable builtin libmpeg2 [autodetect] @@ -577,9 +577,9 @@ _libvorbis=auto _speex=auto _theora=auto -_mp3lib=yes +_mp3lib=auto _liba52=auto -_liba52_internal=yes +_liba52_internal=auto _libdca=auto _libmpeg2=auto _faad=auto @@ -6006,6 +6006,9 @@ echores "$_theora" echocheck "internal mp3lib support" +if test "$_mp3lib" = auto ; then + test "$cc_vendor" = intel && _mp3lib=no || _mp3lib=yes +fi if test "$_mp3lib" = yes ; then _def_mp3lib='#define CONFIG_MP3LIB 1' _codecmodules="mp3lib $_codecmodules" @@ -6016,6 +6019,9 @@ echores "$_mp3lib" echocheck "liba52 support" +if test "$_liba52_internal" = auto ; then + test "$cc_vendor" = intel && _liba52_internal=no || _liba52_internal=yes +fi _def_liba52='#undef CONFIG_LIBA52' _def_liba52_internal="#undef CONFIG_LIBA52_INTERNAL" if test "$_liba52_internal" = yes ; then