final (?) libvo2 cleanup patch by Joey Parrish

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7113 b3059339-0415-0410-9bf9-f77b7e298cf2

Makefile

@@ -38,13 +38,8 @@ SRCS_MPLAYER = mplayer.c mp_msg.c $(SRCS_COMMON) mixer.c mp-opt-reg.c
 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 @@ MISC_LIBS += -Llibdha -ldha -Lvidix -lvidix
 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 @@ all:	$(ALL_PRG)
 .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
@@ -167,9 +151,6 @@ libmpeg2/libmpeg2.a:
 libvo/libvo.a:
 	$(MAKE) -C libvo
 
-libvo2/libvo2.a:
-	$(MAKE) -C libvo2
-
 libao2/libao2.a:
 	$(MAKE) -C libao2
 

configure

@@ -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 @@ _tdfxfb=no
 _directfb=auto
 _zr=auto
 _largefiles=no
-_vo2=no
 _language=en
 _shm=auto
 _linux_devfs=no
@@ -1128,8 +1126,6 @@ for ac_option do
   --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 @@ VIDIX = $_vidix
 
 OPENDIVX = $_opendivx
 
-VO2 = $_vo2
-
 PNG = $_mkf_png
 JPEG = $_mkf_jpg
 GIF = $_mkf_gif
@@ -4708,20 +4702,6 @@ 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
-
-#############################################################################
-
 echo "Creating libao2/config.mak"
 _aoobj=`echo $_aosrc | sed -e 's/\.c/\.o/g'`
 cat > libao2/config.mak << EOF

dll_init.c

@@ -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;

find_sub.c

@@ -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;

xacodec.c

@@ -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"