Added proper #include's for libvo2

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

7 files changed, 29 insertions, 7 deletions

diff --git a/codec-cfg.c b/codec-cfg.c
index ee5e0b8bf2..0b26969d00 100644
--- a/codec-cfg.c
+++ b/codec-cfg.c
@@ -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)
diff --git a/configure b/configure
index 77329bf793..fd756e6bc1 100755
--- a/configure
+++ b/configure
@@ -2522,12 +2522,12 @@ else
 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 @@ prefix = $_prefix
 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 @@ cat > $CCONF << EOF
 
 #define USE_OSD
 #define USE_SUB
-$_vodef
 
 $_debugdef
 
diff --git a/dll_init.c b/dll_init.c
index 69b3c2e19e..015ae87728 100644
--- a/dll_init.c
+++ b/dll_init.c
@@ -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;
diff --git a/find_sub.c b/find_sub.c
index e40d2f328e..1c022efc4c 100644
--- a/find_sub.c
+++ b/find_sub.c
@@ -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;
 
diff --git a/mencoder.c b/mencoder.c
index e3b30b3e54..9c8c831295 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -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"
diff --git a/mplayer.c b/mplayer.c
index 5535733cbc..b616eeeeca 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -39,9 +39,11 @@ void find_sub(subtitle* subtitles,int key);
 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"
 
diff --git a/xacodec.c b/xacodec.c
index c05cce6c41..56209dae4c 100644
--- a/xacodec.c
+++ b/xacodec.c
@@ -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"