[MPlayer-cvslog] r19026 - in trunk: Makefile configure libvo/video_out.c

[diego]

Author: diego
Date: Wed Jul 12 15:03:40 2006
New Revision: 19026

Modified:
   trunk/Makefile
   trunk/configure
   trunk/libvo/video_out.c

Log:
Remove remnants of old libmp1e support.


Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Wed Jul 12 15:03:40 2006
@@ -67,7 +67,6 @@
           $(X_LIB) \
           $(SDL_LIB) \
           $(GGI_LIB) \
-          $(MP1E_LIB) \
           $(MLIB_LIB) \
           $(SVGA_LIB) \
           $(DIRECTFB_LIB) \
@@ -210,7 +209,6 @@
 endif
 
 COMMON_DEPS = $(W32_DEP) \
-              $(MP1E_DEP) \
               $(AV_DEP) \
               libmpdemux/libmpdemux.a \
               libmpcodecs/libmpcodecs.a \

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Wed Jul 12 15:03:40 2006
@@ -1572,7 +1572,6 @@
 _libpostproc=auto
 _libpostproc_so=auto
 _libfame=auto
-_mp1e=no
 _mencoder=yes
 _x11=auto
 _dga=auto	# 1 2 no auto
@@ -1792,8 +1791,6 @@
   --disable-langinfo)	_langinfo=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	;;
@@ -4701,31 +4698,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='libmp1e/libmp1e.a'
-  _dep_mp1e='libmp1e/libmp1e.a'
-else
-  _mp1e=no
-  _def_mp1e='#undef USE_MP1E'
-  _ld_mp1e=""
-  _dep_mp1e=''
-fi
-echores "$_mp1e"
-
 
 echocheck "libfame"
 if test "$_libfame" = auto ; then
@@ -7581,8 +7556,6 @@
 FAME = $_libfame
 FAME_LIB = $_ld_libfame
 LIBDV = $_libdv
-MP1E_DEP = $_dep_mp1e
-MP1E_LIB = $_ld_mp1e
 ARCH_LIB =  $_ld_arch $_ld_iconv
 XVID = $_xvid
 XVID4 = $_xvid4
@@ -7806,9 +7779,6 @@
 $_def_mp3lame_preset
 $_def_mp3lame_preset_medium
 
-/* 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)
    -bps gives better sync for vbr mp3 audio, it is now default */

Modified: trunk/libvo/video_out.c
==============================================================================
--- trunk/libvo/video_out.c	(original)
+++ trunk/libvo/video_out.c	Wed Jul 12 15:03:40 2006
@@ -53,7 +53,7 @@
 int WinID = -1;
 
 int vo_pts=0; // for hw decoding
-float vo_fps=0; // for mp1e rte
+float vo_fps=0;
 
 char *vo_subdevice = NULL;
 int vo_directrendering=0;