diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | configure | 30 | ||||
| -rw-r--r-- | libvo/video_out.c | 2 |
3 files changed, 1 insertions, 33 deletions
@@ -67,7 +67,6 @@ VO_LIBS = $(AA_LIB) \ $(X_LIB) \ $(SDL_LIB) \ $(GGI_LIB) \ - $(MP1E_LIB) \ $(MLIB_LIB) \ $(SVGA_LIB) \ $(DIRECTFB_LIB) \ @@ -210,7 +209,6 @@ ALL_PRG += $(PRG_MENCODER) endif COMMON_DEPS = $(W32_DEP) \ - $(MP1E_DEP) \ $(AV_DEP) \ libmpdemux/libmpdemux.a \ libmpcodecs/libmpcodecs.a \ @@ -1572,7 +1572,6 @@ _libavformat_so=auto _libpostproc=auto _libpostproc_so=auto _libfame=auto -_mp1e=no _mencoder=yes _x11=auto _dga=auto # 1 2 no auto @@ -1792,8 +1791,6 @@ for ac_option do --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 @@ if test "$_dxr3" = yes ; then 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 @@ ZORAN = $_zr 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 $_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 */ diff --git a/libvo/video_out.c b/libvo/video_out.c index f4ff125d51..f66b8e95ce 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -53,7 +53,7 @@ int vo_border=1; 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; |