CVS: main Makefile,1.200,1.201 configure,1.546,1.547 dll_init.c,1.45,1.46 find_sub.c,1.7,1.8 xacodec.c,1.32,1.33
Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv2826 Modified Files: Makefile configure dll_init.c find_sub.c xacodec.c Log Message: final (?) libvo2 cleanup patch by Joey Parrish Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/Makefile,v retrieving revision 1.200 retrieving revision 1.201 diff -u -r1.200 -r1.201 --- Makefile 28 Aug 2002 15:55:42 -0000 1.200 +++ Makefile 28 Aug 2002 16:09:31 -0000 1.201 @@ -38,13 +38,8 @@ OBJS_MENCODER = $(SRCS_MENCODER:.c=.o) OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o) -ifeq ($(VO2),yes) -VO_LIBS = -Llibvo2 -lvo2 -VO_INC = -Ilibvo2 -else VO_LIBS = -Llibvo -lvo VO_INC = -Ilibvo -endif V_LIBS = $(X_LIB) $(MP1E_LIB) $(GGI_LIB) $(MLIB_LIB) $(SDL_LIB) $(SVGA_LIB) $(AA_LIB) $(DIRECTFB_LIB) AO_LIBS = -Llibao2 -lao2 @@ -57,16 +52,10 @@ endif CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader $(VO_INC) $(EXTRA_INC) $(CDPARANOIA_INC)# -Wall -PARTS = libfame libmpdemux libmpcodecs mp3lib liba52 libmp1e libmpeg2 libavcodec libao2 drivers linux postproc input libmpdvdkit +PARTS = libfame libmpdemux libmpcodecs mp3lib liba52 libmp1e libmpeg2 libavcodec libao2 drivers linux postproc input libmpdvdkit libvo ifeq ($(VIDIX),yes) PARTS += libdha vidix endif -ifeq ($(VO2),yes) -PARTS += libvo2 -else -PARTS += libvo -endif - ifeq ($(GUI),yes) PARTS += Gui endif @@ -97,16 +86,11 @@ .c.o: $(CC) -c $(CFLAGS) -o $@ $< -COMMON_DEPS = libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a linux/libosdep.a postproc/libpostproc.a input/libinput.a +COMMON_DEPS = libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a linux/libosdep.a postproc/libpostproc.a input/libinput.a libvo/libvo.a ifeq ($(VIDIX),yes) COMMON_DEPS += libdha/libdha.so vidix/libvidix.a endif -ifeq ($(VO2),yes) -COMMON_DEPS += libvo2/libvo2.a -else -COMMON_DEPS += libvo/libvo.a -endif ifeq ($(FAME),yes) COMMON_DEPS += libfame/libfame.a endif @@ -166,9 +150,6 @@ libvo/libvo.a: $(MAKE) -C libvo - -libvo2/libvo2.a: - $(MAKE) -C libvo2 libao2/libao2.a: $(MAKE) -C libao2 Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.546 retrieving revision 1.547 diff -u -r1.546 -r1.547 --- configure 28 Aug 2002 15:55:42 -0000 1.546 +++ configure 28 Aug 2002 16:09:31 -0000 1.547 @@ -19,8 +19,7 @@ # # GOTCHAS: # - config files are currently: -# config.h config.mak libvo/config.mak libao2/config.mak -# Gui/config.mak libvo2/config.mak +# config.h config.mak libvo/config.mak libao2/config.mak Gui/config.mak # ############################################################################# @@ -970,7 +969,6 @@ _directfb=auto _zr=auto _largefiles=no -_vo2=no _language=en _shm=auto _linux_devfs=no @@ -1128,8 +1126,6 @@ --disable-mtrr) _mtrr=no ;; --enable-largefiles) _largefiles=yes ;; --disable-largefiles) _largefiles=no ;; - --enable-vo2) _vo2=yes ;; - --disable-vo2) _vo2=no ;; --enable-shm) _shm=yes ;; --disable-shm) _shm=no ;; --enable-select) _select=yes ;; @@ -4211,8 +4207,6 @@ OPENDIVX = $_opendivx -VO2 = $_vo2 - PNG = $_mkf_png JPEG = $_mkf_jpg GIF = $_mkf_gif @@ -4705,20 +4699,6 @@ OPTIONAL_SRCS = $_vosrc OPTIONAL_OBJS = $_voobj EOF - -############################################################################# - -if test -d "libvo2" ; then - -echo "Creating libvo2/config.mak" -_vo2obj=`echo $_vo2src | sed -e 's/\.c/\.o/g'` -cat > libvo2/config.mak << EOF -include ../config.mak -OPTIONAL_SRCS = $_vo2src -OPTIONAL_OBJS = $_vo2obj -EOF - -fi ############################################################################# Index: dll_init.c =================================================================== RCS file: /cvsroot/mplayer/main/dll_init.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- dll_init.c 23 Jun 2002 16:01:35 -0000 1.45 +++ dll_init.c 28 Aug 2002 16:09:31 -0000 1.46 @@ -24,11 +24,7 @@ #include "dll_init.h" -#ifdef USE_LIBVO2 -#include "libvo2/img_format.h" -#else #include "libvo/img_format.h" -#endif #include "linux/shmem.h" extern int divx_quality; Index: find_sub.c =================================================================== RCS file: /cvsroot/mplayer/main/find_sub.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- find_sub.c 15 Apr 2002 19:17:12 -0000 1.7 +++ find_sub.c 28 Aug 2002 16:09:31 -0000 1.8 @@ -8,13 +8,8 @@ #include <stdio.h> -#ifdef USE_LIBVO2 -#include "libvo2/libvo2.h" -#include "libvo2/sub.h" -#else #include "libvo/video_out.h" #include "libvo/sub.h" -#endif #include "subreader.h" static int current_sub=0; Index: xacodec.c =================================================================== RCS file: /cvsroot/mplayer/main/xacodec.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- xacodec.c 23 Jun 2002 16:01:35 -0000 1.32 +++ xacodec.c 28 Aug 2002 16:09:31 -0000 1.33 @@ -29,11 +29,7 @@ #include "codec-cfg.h" #include "stheader.h" -#ifdef USE_LIBVO2 -#include "libvo2/img_format.h" -#else #include "libvo/img_format.h" -#endif #include "linux/timer.h" #include "xacodec.h"
participants (1)
-
Alex Beregszaszi