Mercurial > mplayer.hg

comparison configure @ 27479:4a08c1c8a8a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename --enable-tremor-external option to --enable-tremor along with the corresponding variables.
author diego
date Mon, 01 Sep 2008 17:56:02 +0000
parents 158a04c991d6
children ac61ea373b4a
comparison
equal deleted inserted replaced
27478:158a04c991d6 27479:4a08c1c8a8a9
299 --disable-libpostproc_so disable shared libpostproc [autodetect] 299 --disable-libpostproc_so disable shared libpostproc [autodetect]
300 --disable-libavcodec_mpegaudio_hp disable high precision audio decoding 300 --disable-libavcodec_mpegaudio_hp disable high precision audio decoding
301 in libavcodec [enabled] 301 in libavcodec [enabled]
302 --disable-tremor-internal disable internal Tremor [enabled] 302 --disable-tremor-internal disable internal Tremor [enabled]
303 --enable-tremor-low enable lower accuracy internal Tremor [disabled] 303 --enable-tremor-low enable lower accuracy internal Tremor [disabled]
304 --enable-tremor-external enable external Tremor [autodetect] 304 --enable-tremor enable external Tremor [autodetect]
305 --disable-libvorbis disable libvorbis support [autodetect] 305 --disable-libvorbis disable libvorbis support [autodetect]
306 --disable-speex disable Speex support [autodetect] 306 --disable-speex disable Speex support [autodetect]
307 --enable-theora enable OggTheora libraries [autodetect] 307 --enable-theora enable OggTheora libraries [autodetect]
308 --enable-faad enable external FAAD2 (AAC) [autodetect] 308 --enable-faad enable external FAAD2 (AAC) [autodetect]
309 --disable-faad-internal disable internal FAAD2 (AAC) [autodetect] 309 --disable-faad-internal disable internal FAAD2 (AAC) [autodetect]
565 _mad=auto 565 _mad=auto
566 _mp3lame=auto 566 _mp3lame=auto
567 _mp3lame_lavc=auto 567 _mp3lame_lavc=auto
568 _toolame=auto 568 _toolame=auto
569 _twolame=auto 569 _twolame=auto
570 _tremor=auto
570 _tremor_internal=yes 571 _tremor_internal=yes
571 _tremor_low=no 572 _tremor_low=no
572 _tremor_external=auto
573 _libvorbis=auto 573 _libvorbis=auto
574 _speex=auto 574 _speex=auto
575 _theora=auto 575 _theora=auto
576 _mp3lib=yes 576 _mp3lib=yes
577 _liba52=yes 577 _liba52=yes
926 --disable-liblzo) _liblzo=no ;; 926 --disable-liblzo) _liblzo=no ;;
927 --enable-libvorbis) _libvorbis=yes ;; 927 --enable-libvorbis) _libvorbis=yes ;;
928 --disable-libvorbis) _libvorbis=no ;; 928 --disable-libvorbis) _libvorbis=no ;;
929 --enable-speex) _speex=yes ;; 929 --enable-speex) _speex=yes ;;
930 --disable-speex) _speex=no ;; 930 --disable-speex) _speex=no ;;
931 --enable-tremor) _tremor=yes ;;
932 --disable-tremor) _tremor=no ;;
931 --enable-tremor-internal) _tremor_internal=yes ;; 933 --enable-tremor-internal) _tremor_internal=yes ;;
932 --disable-tremor-internal) _tremor_internal=no ;; 934 --disable-tremor-internal) _tremor_internal=no ;;
933 --enable-tremor-low) _tremor_low=yes ;; 935 --enable-tremor-low) _tremor_low=yes ;;
934 --disable-tremor-low) _tremor_low=no ;; 936 --disable-tremor-low) _tremor_low=no ;;
935 --enable-tremor-external) _tremor_external=yes ;;
936 --disable-tremor-external) _tremor_external=no ;;
937 --enable-theora) _theora=yes ;; 937 --enable-theora) _theora=yes ;;
938 --disable-theora) _theora=no ;; 938 --disable-theora) _theora=no ;;
939 --enable-mp3lib) _mp3lib=yes ;; 939 --enable-mp3lib) _mp3lib=yes ;;
940 --disable-mp3lib) _mp3lib=no ;; 940 --disable-mp3lib) _mp3lib=no ;;
941 --enable-liba52) _liba52=yes ;; 941 --enable-liba52) _liba52=yes ;;
5933 echores "$_toolame" 5933 echores "$_toolame"
5934 5934
5935 echocheck "OggVorbis support" 5935 echocheck "OggVorbis support"
5936 if test "$_tremor_internal" = yes; then 5936 if test "$_tremor_internal" = yes; then
5937 _libvorbis=no 5937 _libvorbis=no
5938 elif test "$_tremor_external" = auto; then 5938 elif test "$_tremor" = auto; then
5939 _tremor_external=no 5939 _tremor=no
5940 cat > $TMPC << EOF 5940 cat > $TMPC << EOF
5941 #include <tremor/ivorbiscodec.h> 5941 #include <tremor/ivorbiscodec.h>
5942 int main(void) { vorbis_packet_blocksize(0,0); return 0; } 5942 int main(void) { vorbis_packet_blocksize(0,0); return 0; }
5943 EOF 5943 EOF
5944 cc_check -logg -lvorbisidec $_ld_lm && _tremor_external=yes && _libvorbis=no 5944 cc_check -logg -lvorbisidec $_ld_lm && _tremor=yes && _libvorbis=no
5945 fi 5945 fi
5946 if test "$_libvorbis" = auto; then 5946 if test "$_libvorbis" = auto; then
5947 _libvorbis=no 5947 _libvorbis=no
5948 cat > $TMPC << EOF 5948 cat > $TMPC << EOF
5949 #include <vorbis/codec.h> 5949 #include <vorbis/codec.h>
5959 _res_comment="internal Tremor" 5959 _res_comment="internal Tremor"
5960 if test "$_tremor_low" = yes ; then 5960 if test "$_tremor_low" = yes ; then
5961 cflags_tremor_low="-D_LOW_ACCURACY_" 5961 cflags_tremor_low="-D_LOW_ACCURACY_"
5962 _res_comment="internal low accuracy Tremor" 5962 _res_comment="internal low accuracy Tremor"
5963 fi 5963 fi
5964 elif test "$_tremor_external" = yes ; then 5964 elif test "$_tremor" = yes ; then
5965 _vorbis=yes 5965 _vorbis=yes
5966 _def_vorbis='#define CONFIG_OGGVORBIS 1' 5966 _def_vorbis='#define CONFIG_OGGVORBIS 1'
5967 _def_tremor='#define CONFIG_TREMOR 1' 5967 _def_tremor='#define CONFIG_TREMOR 1'
5968 _codecmodules="tremor(external) $_codecmodules" 5968 _codecmodules="tremor(external) $_codecmodules"
5969 _res_comment="external Tremor" 5969 _res_comment="external Tremor"