Mercurial > mplayer.hg

comparison configure @ 35165:b924f0df5a1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove our internal mp3lib copy. We have FFmpeg as integrated decoder, and the external mpg123 library should include all important improvements from our mp3lib and is actually properly maintained.
author reimar
date Sun, 21 Oct 2012 12:10:38 +0000
parents 5e11b54c9212
children cc35fea76ccc
comparison
equal deleted inserted replaced
35164:bc0898c7399b 35165:b924f0df5a1d
447 --disable-mp3lame-lavc disable LAME in libavcodec [autodetect] 447 --disable-mp3lame-lavc disable LAME in libavcodec [autodetect]
448 --disable-toolame disable Toolame (MPEG layer 2) encoding [autodetect] 448 --disable-toolame disable Toolame (MPEG layer 2) encoding [autodetect]
449 --disable-twolame disable Twolame (MPEG layer 2) encoding [autodetect] 449 --disable-twolame disable Twolame (MPEG layer 2) encoding [autodetect]
450 --enable-xmms enable XMMS input plugin support [disabled] 450 --enable-xmms enable XMMS input plugin support [disabled]
451 --enable-libdca enable libdca support [autodetect] 451 --enable-libdca enable libdca support [autodetect]
452 --disable-mp3lib disable builtin mp3lib [autodetect]
453 --disable-liba52 disable liba52 [autodetect] 452 --disable-liba52 disable liba52 [autodetect]
454 --disable-libmpeg2 disable libmpeg2 [autodetect] 453 --disable-libmpeg2 disable libmpeg2 [autodetect]
455 --disable-libmpeg2-internal disable builtin libmpeg2 [autodetect] 454 --disable-libmpeg2-internal disable builtin libmpeg2 [autodetect]
456 --enable-musepack enable libmpcdec support (deprecated in favour of libavcodec) [disabled] 455 --enable-musepack enable libmpcdec support (deprecated in favour of libavcodec) [disabled]
457 --disable-libopencore_amrnb disable libopencore_amr narrowband [autodetect] 456 --disable-libopencore_amrnb disable libopencore_amr narrowband [autodetect]
755 _libvorbis=auto 754 _libvorbis=auto
756 _speex=auto 755 _speex=auto
757 _libgsm=auto 756 _libgsm=auto
758 _theora=auto 757 _theora=auto
759 _mpg123=auto 758 _mpg123=auto
760 _mp3lib=auto
761 _liba52=auto 759 _liba52=auto
762 _libdca=auto 760 _libdca=auto
763 _libmpeg2=auto 761 _libmpeg2=auto
764 _libmpeg2_internal=auto 762 _libmpeg2_internal=auto
765 _faad=auto 763 _faad=auto
1154 --disable-tremor) _tremor=no ;; 1152 --disable-tremor) _tremor=no ;;
1155 --enable-theora) _theora=yes ;; 1153 --enable-theora) _theora=yes ;;
1156 --disable-theora) _theora=no ;; 1154 --disable-theora) _theora=no ;;
1157 --enable-mpg123) _mpg123=yes ;; 1155 --enable-mpg123) _mpg123=yes ;;
1158 --disable-mpg123) _mpg123=no ;; 1156 --disable-mpg123) _mpg123=no ;;
1159 --enable-mp3lib) _mp3lib=yes ;;
1160 --disable-mp3lib) _mp3lib=no ;;
1161 --enable-liba52) _liba52=yes ;; 1157 --enable-liba52) _liba52=yes ;;
1162 --disable-liba52) _liba52=no ;; 1158 --disable-liba52) _liba52=no ;;
1163 --enable-libdca) _libdca=yes ;; 1159 --enable-libdca) _libdca=yes ;;
1164 --disable-libdca) _libdca=no ;; 1160 --disable-libdca) _libdca=no ;;
1165 --enable-libmpeg2) _libmpeg2=yes ;; 1161 --enable-libmpeg2) _libmpeg2=yes ;;
6408 def_theora='#undef CONFIG_OGGTHEORA' 6404 def_theora='#undef CONFIG_OGGTHEORA'
6409 nocodecmodules="libtheora $nocodecmodules" 6405 nocodecmodules="libtheora $nocodecmodules"
6410 fi 6406 fi
6411 echores "$_theora" 6407 echores "$_theora"
6412 6408
6413 echocheck "mp3lib support"
6414 if test "$_mp3lib" = auto ; then
6415 test "$cc_vendor" = intel && test "$_cc_major" -le 10 -o "$_cc_major" -eq 11 -a "$_cc_minor" -eq 0 && _mp3lib=no || _mp3lib=yes
6416 fi
6417 if test "$_mp3lib" = yes ; then
6418 def_mp3lib='#define CONFIG_MP3LIB 1'
6419 codecmodules="mp3lib(internal) $codecmodules"
6420 else
6421 def_mp3lib='#undef CONFIG_MP3LIB'
6422 nocodecmodules="mp3lib(internal) $nocodecmodules"
6423 fi
6424 echores "$_mp3lib"
6425
6426 # Any version of libmpg123 that knows MPG123_RESYNC_LIMIT shall be fine. 6409 # Any version of libmpg123 that knows MPG123_RESYNC_LIMIT shall be fine.
6427 # That is, 1.2.0 onwards. Recommened is 1.14 onwards, though. 6410 # That is, 1.2.0 onwards. Recommened is 1.14 onwards, though.
6428 echocheck "mpg123 support" 6411 echocheck "mpg123 support"
6429 def_mpg123='#undef CONFIG_MPG123' 6412 def_mpg123='#undef CONFIG_MPG123'
6430 if test "$_mpg123" = auto; then 6413 if test "$_mpg123" = auto; then
8249 MACOSX_FINDER = $_macosx_finder 8232 MACOSX_FINDER = $_macosx_finder
8250 MD5SUM = $_md5sum 8233 MD5SUM = $_md5sum
8251 MGA = $_mga 8234 MGA = $_mga
8252 MNG = $_mng 8235 MNG = $_mng
8253 MP3LAME = $_mp3lame 8236 MP3LAME = $_mp3lame
8254 MP3LIB = $_mp3lib
8255 MPG123 = $_mpg123 8237 MPG123 = $_mpg123
8256 MUSEPACK = $_musepack 8238 MUSEPACK = $_musepack
8257 NAS = $_nas 8239 NAS = $_nas
8258 NATIVE_RTSP = $_native_rtsp 8240 NATIVE_RTSP = $_native_rtsp
8259 NETWORKING = $networking 8241 NETWORKING = $networking
8634 $def_libopus 8616 $def_libopus
8635 $def_mad 8617 $def_mad
8636 $def_mp3lame 8618 $def_mp3lame
8637 $def_mp3lame_preset 8619 $def_mp3lame_preset
8638 $def_mp3lame_preset_medium 8620 $def_mp3lame_preset_medium
8639 $def_mp3lib
8640 $def_mpg123 8621 $def_mpg123
8641 $def_musepack 8622 $def_musepack
8642 $def_speex 8623 $def_speex
8643 $def_theora 8624 $def_theora
8644 $def_toolame 8625 $def_toolame