[Mplayer-cvslog] CVS: main configure,1.244,1.245 mplayer.c,1.317,1.318 xacodec.c,1.26,1.27 find_sub.c,1.3,1.4 codec-cfg.c,1.46,1.47 dll_init.c,1.35,1.36 mencoder.c,1.25,1.26

[David Holm]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv1468

Modified Files:
	configure mplayer.c xacodec.c find_sub.c codec-cfg.c 
	dll_init.c mencoder.c 
Log Message:
Added proper #include's for libvo2


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- configure	14 Nov 2001 10:49:12 -0000	1.244
+++ configure	14 Nov 2001 11:16:45 -0000	1.245
@@ -2522,12 +2522,12 @@
 fi
 
 if test "$_vo2" = yes ; then
- _vodef='#define USE_LIBVO2'
+ _vodef='-DUSE_LIBVO2'
  _volib='-Llibvo2 -lvo2'
  _voinc='-Ilibvo2'
  _vodir='libvo2'
 else
- _vodef='#undef USE_LIBVO2'
+ _vodef=''
  _volib='-Llibvo -lvo'
  _voinc='-Ilibvo'
  _vodir='libvo'
@@ -2582,7 +2582,7 @@
 AR=ar
 CC=$_cc
 # OPTFLAGS=-O4 $_profile $_debug $_march $_mcpu -pipe -fomit-frame-pointer -ffast-math
-OPTFLAGS=$CFLAGS
+OPTFLAGS=$CFLAGS $_vodef
 EXTRA_INC=$_extraincdir $_voinc $_gtkinc
 WIN32_PATH=-DWIN32_PATH=\\"$_win32libdir\\"
 VO_INC=$_voinc
@@ -2650,7 +2650,6 @@
 
 #define USE_OSD
 #define USE_SUB
-$_vodef
 
 $_debugdef
 

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -r1.317 -r1.318
--- mplayer.c	14 Nov 2001 00:26:28 -0000	1.317
+++ mplayer.c	14 Nov 2001 11:16:45 -0000	1.318
@@ -39,9 +39,11 @@
 extern void* mDisplay; // Display* mDisplay;
 #endif
 
-//#ifdef USE_OSD
+#ifdef USE_LIBVO2
+#include "libvo2/sub.h"
+#else
 #include "libvo/sub.h"
-//#endif
+#endif
 
 #include "libao2/audio_out.h"
 

Index: xacodec.c
===================================================================
RCS file: /cvsroot/mplayer/main/xacodec.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xacodec.c	10 Nov 2001 14:33:52 -0000	1.26
+++ xacodec.c	14 Nov 2001 11:16:45 -0000	1.27
@@ -27,7 +27,11 @@
 #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"
 

Index: find_sub.c
===================================================================
RCS file: /cvsroot/mplayer/main/find_sub.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- find_sub.c	30 Jul 2001 02:00:54 -0000	1.3
+++ find_sub.c	14 Nov 2001 11:16:45 -0000	1.4
@@ -8,9 +8,14 @@
 
 #include <stdio.h>
 
+#ifdef USE_LIBVO2
+#include "libvo2/libvo2.h"
+#include "libvo2/sub.h"
+#else
 #include "libvo/video_out.h"
-#include "subreader.h"
 #include "libvo/sub.h"
+#endif
+#include "subreader.h"
 
 static int current_sub=0;
 

Index: codec-cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- codec-cfg.c	11 Nov 2001 13:35:00 -0000	1.46
+++ codec-cfg.c	14 Nov 2001 11:16:45 -0000	1.47
@@ -18,7 +18,11 @@
 // for mmioFOURCC:
 #include "wine/avifmt.h"
 
+#ifdef USE_LIBVO2
+#include "libvo2/img_format.h"
+#else
 #include "libvo/img_format.h"
+#endif
 #include "codec-cfg.h"
 
 #define PRINT_LINENUM printf(" at line %d\n", line_num)

Index: dll_init.c
===================================================================
RCS file: /cvsroot/mplayer/main/dll_init.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- dll_init.c	13 Nov 2001 22:59:19 -0000	1.35
+++ dll_init.c	14 Nov 2001 11:16:45 -0000	1.36
@@ -24,7 +24,11 @@
 
 #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: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mencoder.c	13 Nov 2001 23:43:33 -0000	1.25
+++ mencoder.c	14 Nov 2001 11:16:45 -0000	1.26
@@ -20,7 +20,11 @@
 
 #include "aviwrite.h"
 
+#ifdef USE_LIBVO2
+#include "libvo2/libvo2.h"
+#else
 #include "libvo/video_out.h"
+#endif
 
 #include "dec_audio.h"
 #include "dec_video.h"