Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv16616 Modified Files: configure Log Message: mp1e removed Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.430 retrieving revision 1.431 diff -u -r1.430 -r1.431 --- configure 21 Apr 2002 02:44:25 -0000 1.430 +++ configure 21 Apr 2002 13:44:45 -0000 1.431 @@ -134,8 +134,6 @@ --enable-faad build with FAAD (AAC) support [autodetect] --disable-iconv do not use iconv(3) function [autodetect] --disable-rtc disable RTC (/dev/rtc) on Linux [autodetect] - --enable-mp1e enable libmp1e support - (use this option if it does not compile) [disable] --disable-libdv disable libdv 0.9.5 support [autodetect] --disable-streaming disable network streaming support (support for: http/mms/rtp) [enable] @@ -759,7 +757,6 @@ # If autodetection is available then the third state is: auto _libavcodec=auto _libavcodecso=no # changed default to no as it causes problems - atmos -_mp1e=no _mencoder=yes _x11=auto _dga=auto # 1 2 no auto @@ -879,8 +876,6 @@ --disable-iconv) _iconv=no ;; --enable-rtc) _rtc=yes ;; --disable-rtc) _rtc=no ;; - --enable-mp1e) _mp1e=yes ;; - --disable-mp1e) _mp1e=no ;; --enable-libdv) _libdv=yes ;; --disable-libdv) _libdv=no ;; --enable-ossaudio) _ossaudio=yes ;; @@ -2274,30 +2269,9 @@ else _def_dxr3='#undef HAVE_DXR3' _novomodules="dxr3 $_novomodules" - if test "$_mp1e" = auto ; then - # we don't need mp1e - _mp1e=no - fi fi echores "$_dxr3" -echocheck "libmp1e" -if test "$_mmx" = no ; then - # mp1e REQUIRES mmx! - _mp1e=no -fi -if test "$_mp1e" != no ; then - _mp1e=yes - _def_mp1e='#define USE_MP1E' - _ld_mp1e="-Llibmp1e -lmp1e" - _dep_mp1e='libmp1e/libmp1e.a' -else - _mp1e=no - _def_mp1e='#undef USE_MP1E' - _ld_mp1e="" - _dep_mp1e='' -fi -echores "$_mp1e" ######### # AUDIO # @@ -3417,8 +3391,6 @@ DS_LIB = $_ld_dshow AV_DEP = $_dep_libavcodec AV_LIB = $_ld_libavcodec -MP1E_DEP = $_dep_mp1e -MP1E_LIB = $_ld_mp1e ARCH_LIB = $_ld_arch $_ld_iconv DIVX4LINUX = $_divx4linux XVID = $_xvid @@ -3510,9 +3482,6 @@ /* Indicates if libmp3lame is available Note: for mencoder */ $_def_mp3lame - -/* Define libmp1e for realtime mpeg encoding (for DXR3 and DVB cards) */ -$_def_mp1e /* Define this to enable avg. byte/sec-based AVI sync method by default: (use -bps or -nobps commandline option for run-time method selection)