Mercurial > mplayer.hg

comparison configure @ 31090:1aece15222b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove internal liba52 copy. Nowadays FFmpeg is faster than liba52 and external liba52 is well supported.
author diego
date Sun, 09 May 2010 14:45:29 +0000
parents fb0f2042a60b
children 768824e790ea
comparison
equal deleted inserted replaced
31089:459227551819 31090:1aece15222b5
333 --disable-twolame disable Twolame (MPEG layer 2) encoding [autodetect] 333 --disable-twolame disable Twolame (MPEG layer 2) encoding [autodetect]
334 --enable-xmms enable XMMS input plugin support [disabled] 334 --enable-xmms enable XMMS input plugin support [disabled]
335 --enable-libdca enable libdca support [autodetect] 335 --enable-libdca enable libdca support [autodetect]
336 --disable-mp3lib disable builtin mp3lib [autodetect] 336 --disable-mp3lib disable builtin mp3lib [autodetect]
337 --disable-liba52 disable liba52 [autodetect] 337 --disable-liba52 disable liba52 [autodetect]
338 --enable-liba52-internal enable builtin liba52 [disabled]
339 --disable-libmpeg2 disable builtin libmpeg2 [autodetect] 338 --disable-libmpeg2 disable builtin libmpeg2 [autodetect]
340 --disable-musepack disable musepack support [autodetect] 339 --disable-musepack disable musepack support [autodetect]
341 --disable-libopencore_amrnb disable libopencore_amr narrowband [autodetect] 340 --disable-libopencore_amrnb disable libopencore_amr narrowband [autodetect]
342 --disable-libopencore_amrwb disable libopencore_amr wideband [autodetect] 341 --disable-libopencore_amrwb disable libopencore_amr wideband [autodetect]
343 --disable-libopenjpeg disable OpenJPEG (JPEG2000) input/output support [autodetect] 342 --disable-libopenjpeg disable OpenJPEG (JPEG2000) input/output support [autodetect]
629 _libvorbis=auto 628 _libvorbis=auto
630 _speex=auto 629 _speex=auto
631 _theora=auto 630 _theora=auto
632 _mp3lib=auto 631 _mp3lib=auto
633 _liba52=auto 632 _liba52=auto
634 _liba52_internal=no
635 _libdca=auto 633 _libdca=auto
636 _libmpeg2=auto 634 _libmpeg2=auto
637 _faad=auto 635 _faad=auto
638 _faad_internal=auto 636 _faad_internal=auto
639 _faad_fixed=no 637 _faad_fixed=no
1026 --disable-tremor-low) _tremor_low=no ;; 1024 --disable-tremor-low) _tremor_low=no ;;
1027 --enable-theora) _theora=yes ;; 1025 --enable-theora) _theora=yes ;;
1028 --disable-theora) _theora=no ;; 1026 --disable-theora) _theora=no ;;
1029 --enable-mp3lib) _mp3lib=yes ;; 1027 --enable-mp3lib) _mp3lib=yes ;;
1030 --disable-mp3lib) _mp3lib=no ;; 1028 --disable-mp3lib) _mp3lib=no ;;
1031 --enable-liba52-internal) _liba52_internal=yes ;;
1032 --disable-liba52-internal) _liba52_internal=no ;;
1033 --enable-liba52) _liba52=yes ;; 1029 --enable-liba52) _liba52=yes ;;
1034 --disable-liba52) _liba52=no ;; 1030 --disable-liba52) _liba52=no ;;
1035 --enable-libdca) _libdca=yes ;; 1031 --enable-libdca) _libdca=yes ;;
1036 --disable-libdca) _libdca=no ;; 1032 --disable-libdca) _libdca=no ;;
1037 --enable-libmpeg2) _libmpeg2=yes ;; 1033 --enable-libmpeg2) _libmpeg2=yes ;;
6794 nocodecmodules="mp3lib(internal) $nocodecmodules" 6790 nocodecmodules="mp3lib(internal) $nocodecmodules"
6795 fi 6791 fi
6796 echores "$_mp3lib" 6792 echores "$_mp3lib"
6797 6793
6798 echocheck "liba52 support" 6794 echocheck "liba52 support"
6799 if test "$_liba52_internal" = auto ; then
6800 test "$cc_vendor" = intel && test "$_cc_major" -le 10 -o "$_cc_major" -eq 11 -a "$_cc_minor" -eq 0 && _liba52_internal=no || _liba52_internal=yes
6801 fi
6802 def_liba52='#undef CONFIG_LIBA52' 6795 def_liba52='#undef CONFIG_LIBA52'
6803 def_liba52_internal="#undef CONFIG_LIBA52_INTERNAL" 6796 if test "$_liba52" = auto ; then
6804 if test "$_liba52_internal" = yes ; then
6805 _liba52=yes
6806 def_liba52_internal="#define CONFIG_LIBA52_INTERNAL 1"
6807 res_comment="internal"
6808 elif test "$_liba52_internal" = no && test "$_liba52" = auto ; then
6809 _liba52=no 6797 _liba52=no
6810 cat > $TMPC << EOF 6798 cat > $TMPC << EOF
6811 #include <inttypes.h> 6799 #include <inttypes.h>
6812 #include <a52dec/a52.h> 6800 #include <a52dec/a52.h>
6813 int main(void) { a52_state_t *testHand; testHand=a52_init(0); return 0; } 6801 int main(void) { a52_state_t *testHand; testHand=a52_init(0); return 0; }
6814 EOF 6802 EOF
6815 cc_check -la52 && _liba52=yes && res_comment="external" && extra_ldflags="$extra_ldflags -la52" 6803 cc_check -la52 && _liba52=yes && extra_ldflags="$extra_ldflags -la52"
6816 fi 6804 fi
6817 if test "$_liba52" = yes ; then 6805 if test "$_liba52" = yes ; then
6818 def_liba52='#define CONFIG_LIBA52 1' 6806 def_liba52='#define CONFIG_LIBA52 1'
6819 codecmodules="liba52($res_comment) $codecmodules" 6807 codecmodules="liba52 $codecmodules"
6820 else 6808 else
6821 nocodecmodules="liba52 $nocodecmodules" 6809 nocodecmodules="liba52 $nocodecmodules"
6822 fi 6810 fi
6823 echores "$_liba52" 6811 echores "$_liba52"
6824 6812
8580 JPEG = $_jpeg 8568 JPEG = $_jpeg
8581 KAI = $_kai 8569 KAI = $_kai
8582 KVA = $_kva 8570 KVA = $_kva
8583 LADSPA = $_ladspa 8571 LADSPA = $_ladspa
8584 LIBA52 = $_liba52 8572 LIBA52 = $_liba52
8585 LIBA52_INTERNAL = $_liba52_internal
8586 LIBASS = $_ass 8573 LIBASS = $_ass
8587 LIBASS_INTERNAL = $ass_internal 8574 LIBASS_INTERNAL = $ass_internal
8588 LIBBS2B = $_libbs2b 8575 LIBBS2B = $_libbs2b
8589 LIBDCA = $_libdca 8576 LIBDCA = $_libdca
8590 LIBDV = $_libdv 8577 LIBDV = $_libdv
8963 /* codec libraries */ 8950 /* codec libraries */
8964 $def_faac 8951 $def_faac
8965 $def_faad 8952 $def_faad
8966 $def_faad_internal 8953 $def_faad_internal
8967 $def_liba52 8954 $def_liba52
8968 $def_liba52_internal
8969 $def_libdca 8955 $def_libdca
8970 $def_libdv 8956 $def_libdv
8971 $def_liblzo 8957 $def_liblzo
8972 $def_libmpeg2 8958 $def_libmpeg2
8973 $def_mad 8959 $def_mad