Mercurial > mplayer.hg
comparison configure @ 19021:94d50878fb0e
Remove remnants of old libmp1e support.
author | diego |
---|---|
date | Wed, 12 Jul 2006 13:03:40 +0000 |
parents | ff4475a41257 |
children | b2dde05fbfc8 |
comparison
equal
deleted
inserted
replaced
19020:979752b5fa5f | 19021:94d50878fb0e |
---|---|
1570 _libavformat=auto | 1570 _libavformat=auto |
1571 _libavformat_so=auto | 1571 _libavformat_so=auto |
1572 _libpostproc=auto | 1572 _libpostproc=auto |
1573 _libpostproc_so=auto | 1573 _libpostproc_so=auto |
1574 _libfame=auto | 1574 _libfame=auto |
1575 _mp1e=no | |
1576 _mencoder=yes | 1575 _mencoder=yes |
1577 _x11=auto | 1576 _x11=auto |
1578 _dga=auto # 1 2 no auto | 1577 _dga=auto # 1 2 no auto |
1579 _xv=auto | 1578 _xv=auto |
1580 _xvmc=no #auto when complete | 1579 _xvmc=no #auto when complete |
1790 --disable-iconv) _iconv=no ;; | 1789 --disable-iconv) _iconv=no ;; |
1791 --enable-langinfo) _langinfo=yes ;; | 1790 --enable-langinfo) _langinfo=yes ;; |
1792 --disable-langinfo) _langinfo=no ;; | 1791 --disable-langinfo) _langinfo=no ;; |
1793 --enable-rtc) _rtc=yes ;; | 1792 --enable-rtc) _rtc=yes ;; |
1794 --disable-rtc) _rtc=no ;; | 1793 --disable-rtc) _rtc=no ;; |
1795 --enable-mp1e) _mp1e=yes ;; | |
1796 --disable-mp1e) _mp1e=no ;; | |
1797 --enable-libdv) _libdv=yes ;; | 1794 --enable-libdv) _libdv=yes ;; |
1798 --disable-libdv) _libdv=no ;; | 1795 --disable-libdv) _libdv=no ;; |
1799 --enable-ossaudio) _ossaudio=yes ;; | 1796 --enable-ossaudio) _ossaudio=yes ;; |
1800 --disable-ossaudio) _ossaudio=no ;; | 1797 --disable-ossaudio) _ossaudio=no ;; |
1801 --enable-arts) _arts=yes ;; | 1798 --enable-arts) _arts=yes ;; |
4699 _vosrc="$_vosrc vo_dxr3.c" | 4696 _vosrc="$_vosrc vo_dxr3.c" |
4700 _vomodules="dxr3 $_vomodules" | 4697 _vomodules="dxr3 $_vomodules" |
4701 else | 4698 else |
4702 _def_dxr3='#undef HAVE_DXR3' | 4699 _def_dxr3='#undef HAVE_DXR3' |
4703 _novomodules="dxr3 $_novomodules" | 4700 _novomodules="dxr3 $_novomodules" |
4704 if test "$_mp1e" = auto ; then | |
4705 # we don't need mp1e | |
4706 _mp1e=no | |
4707 fi | |
4708 fi | 4701 fi |
4709 echores "$_dxr3" | 4702 echores "$_dxr3" |
4710 | |
4711 echocheck "libmp1e" | |
4712 if test "$_mmx" = no ; then | |
4713 # mp1e REQUIRES mmx! | |
4714 _mp1e=no | |
4715 fi | |
4716 if test "$_mp1e" != no ; then | |
4717 _mp1e=yes | |
4718 _def_mp1e='#define USE_MP1E' | |
4719 _ld_mp1e='libmp1e/libmp1e.a' | |
4720 _dep_mp1e='libmp1e/libmp1e.a' | |
4721 else | |
4722 _mp1e=no | |
4723 _def_mp1e='#undef USE_MP1E' | |
4724 _ld_mp1e="" | |
4725 _dep_mp1e='' | |
4726 fi | |
4727 echores "$_mp1e" | |
4728 | 4703 |
4729 | 4704 |
4730 echocheck "libfame" | 4705 echocheck "libfame" |
4731 if test "$_libfame" = auto ; then | 4706 if test "$_libfame" = auto ; then |
4732 _libfame=no | 4707 _libfame=no |
7579 CONFIG_LIBPOSTPROC_SO = $_libpostproc_so | 7554 CONFIG_LIBPOSTPROC_SO = $_libpostproc_so |
7580 ZORAN = $_zr | 7555 ZORAN = $_zr |
7581 FAME = $_libfame | 7556 FAME = $_libfame |
7582 FAME_LIB = $_ld_libfame | 7557 FAME_LIB = $_ld_libfame |
7583 LIBDV = $_libdv | 7558 LIBDV = $_libdv |
7584 MP1E_DEP = $_dep_mp1e | |
7585 MP1E_LIB = $_ld_mp1e | |
7586 ARCH_LIB = $_ld_arch $_ld_iconv | 7559 ARCH_LIB = $_ld_arch $_ld_iconv |
7587 XVID = $_xvid | 7560 XVID = $_xvid |
7588 XVID4 = $_xvid4 | 7561 XVID4 = $_xvid4 |
7589 XVID_INC = $_inc_xvid | 7562 XVID_INC = $_inc_xvid |
7590 XVID_LIB = $_ld_xvid | 7563 XVID_LIB = $_ld_xvid |
7804 Note: for mencoder */ | 7777 Note: for mencoder */ |
7805 $_def_mp3lame | 7778 $_def_mp3lame |
7806 $_def_mp3lame_preset | 7779 $_def_mp3lame_preset |
7807 $_def_mp3lame_preset_medium | 7780 $_def_mp3lame_preset_medium |
7808 | 7781 |
7809 /* Define libmp1e for realtime mpeg encoding (for DXR3 and DVB cards) */ | |
7810 $_def_mp1e | |
7811 | |
7812 /* Define this to enable avg. byte/sec-based AVI sync method by default: | 7782 /* Define this to enable avg. byte/sec-based AVI sync method by default: |
7813 (use -bps or -nobps commandline option for run-time method selection) | 7783 (use -bps or -nobps commandline option for run-time method selection) |
7814 -bps gives better sync for vbr mp3 audio, it is now default */ | 7784 -bps gives better sync for vbr mp3 audio, it is now default */ |
7815 #define AVI_SYNC_BPS 1 | 7785 #define AVI_SYNC_BPS 1 |
7816 | 7786 |