[Mplayer-cvslog] CVS: main cfg-mplayer.h,1.102,1.103 configure,1.246,1.247 dec_video.c,1.63,1.64

David Holm mswitch at mplayer.dev.hu
Wed Nov 14 14:17:56 CET 2001


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

Modified Files:
	cfg-mplayer.h configure dec_video.c 
Log Message:
With these last changes libvo2 should compile and link without errors... don't expect any functionality yet though...


Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- cfg-mplayer.h	14 Nov 2001 00:26:28 -0000	1.102
+++ cfg-mplayer.h	14 Nov 2001 13:17:51 -0000	1.103
@@ -70,7 +70,9 @@
 
 
 /* from libvo/aspect.c */
+#ifndef USE_LIBVO2
 extern float monitor_aspect;
+#endif
 
 /*
  * CONF_TYPE_FUNC_FULL :
@@ -184,7 +186,9 @@
 	{"screenh", &vo_screenheight, CONF_TYPE_INT, CONF_RANGE, 0, 4096},
 	{"aspect", &movie_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 3.0},
 	{"noaspect", &movie_aspect, CONF_TYPE_FLAG, 0, 0, 0},
+#ifndef USE_LIBVO2
 	{"monitoraspect", &monitor_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 3.0},
+#endif
         {"vm", &vidmode, CONF_TYPE_FLAG, 0, 0, 1},
         {"novm", &vidmode, CONF_TYPE_FLAG, 0, 1, 0},
 	{"fs", &fullscreen, CONF_TYPE_FLAG, 0, 0, 1},

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- configure	14 Nov 2001 11:35:25 -0000	1.246
+++ configure	14 Nov 2001 13:17:51 -0000	1.247
@@ -1826,24 +1826,23 @@
 echo "Checking for X11 headers ... $_x11incdir"
 if test "$_vo2" = yes ; then
  echo "Checking for libvo2 ... $_vo2"
-else
- echo "Checking mga_vid device ... $_mga"
- echo "Checking for xmga ... $_xmga" 
- echo "Checking for SDL ... $_sdl (with $_sdlconfig)"
- echo "Checking for AA ... $_aa"
- echo "Checking for GGI ... $_ggi"
- echo "Checking for OpenGL ... $_gl"
- echo "Checking for Xv ... $_xv"
- echo "Checking for Xinerama ... $_xinerama"
- echo "Checking for X11 ... $_x11"
- echo "Checking for DGA ... $_dga"
- echo "Checking for DGA 2.0 .. $_dga2"
- echo "Checking for Xf86VM ... $_vm"
- echo "Checking for SVGAlib ... $_svga"
- echo "Checking for FBDev ... $_fbdev"
- echo "Checking for DVB ... $_dvb"
- echo "Checking for DXR3/H+ ... $_dxr3"
 fi
+echo "Checking mga_vid device ... $_mga"
+echo "Checking for xmga ... $_xmga" 
+echo "Checking for SDL ... $_sdl (with $_sdlconfig)"
+echo "Checking for AA ... $_aa"
+echo "Checking for GGI ... $_ggi"
+echo "Checking for OpenGL ... $_gl"
+echo "Checking for Xv ... $_xv"
+echo "Checking for Xinerama ... $_xinerama"
+echo "Checking for X11 ... $_x11"
+echo "Checking for DGA ... $_dga"
+echo "Checking for DGA 2.0 .. $_dga2"
+echo "Checking for Xf86VM ... $_vm"
+echo "Checking for SVGAlib ... $_svga"
+echo "Checking for FBDev ... $_fbdev"
+echo "Checking for DVB ... $_dvb"
+echo "Checking for DXR3/H+ ... $_dxr3"
 echo "Checking for OSS Audio ... $_oss_audio"
 echo "Checking for ALSA Audio ... $_alsaver"
 echo "Checking for ESD Audio ... $_esd"
@@ -2088,14 +2087,14 @@
 
 if test "$_x11" = yes ; then
   if test "$_xdpms_3" = yes ; then
-    _x11lib='-lX11 -lXext -lXdpms'
-    _have_xdpms='#define HAVE_XDPMS 1'
+   _x11lib='-lX11 -lXext -lXdpms'
+   _have_xdpms='#define HAVE_XDPMS 1'
   elif test "$_xdpms_4" = yes ; then
-    _x11lib='-lX11 -lXext'
-    _have_xdpms='#define HAVE_XDPMS 1'
+   _x11lib='-lX11 -lXext'
+   _have_xdpms='#define HAVE_XDPMS 1'
   else
-    _x11lib='-lX11 -lXext'
-    _have_xdpms='#undef HAVE_XDPMS'
+   _x11lib='-lX11 -lXext'
+   _have_xdpms='#undef HAVE_XDPMS'
   fi
 fi
 
@@ -2355,21 +2354,6 @@
 _vosrc=''
 #_aosrc=''
 
-if test "$_aa" = yes ; then
- _aa='#define HAVE_AA'
- _vosrc=$_vosrc' vo_aa.c'
- _aalib='-laa'
-else
- _aa='#undef HAVE_AA'
- _aalib=''
-fi
-
-if test "$_png" = yes ; then
- _png='#define HAVE_PNG'
- _vosrc=$_vosrc' vo_png.c'
-else
-   _png='#undef HAVE_PNG'
-fi
 
 if test "$_mad" = yes ; then
   _madlibrary='#define USE_LIBMAD'
@@ -2390,38 +2374,96 @@
 
 # ---
 
+if test "$_vo2" = yes ; then
+ _vodef='-DUSE_LIBVO2'
+ _volib='-Llibvo2 -lvo2'
+ _voinc='-Ilibvo2'
+ _vodir='libvo2'
+else
+ _vodef=''
+ _volib='-Llibvo -lvo'
+ _voinc='-Ilibvo'
+ _vodir='libvo'
+ _aosrc=$_aosrc' ao_mpegpes.c'
+fi
+
+if test "$_aa" = yes ; then
+ if test "$_vo2" = no ; then
+  _aa='#define HAVE_AA'
+  _vosrc=$_vosrc' vo_aa.c'
+  _aalib='-laa'
+ else
+  _aa='#undef HAVE_AA'
+  _aalib=''
+ fi
+else
+ _aa='#undef HAVE_AA'
+ _aalib=''
+fi
+
+if test "$_png" = yes ; then
+ if test "$_vo2" = no ; then
+  _png='#define HAVE_PNG'
+  _vosrc=$_vosrc' vo_png.c'
+ else
+  _png='#undef HAVE_PNG'
+ fi
+else
+ _png='#undef HAVE_PNG'
+fi
+
 if test "$_gl" = yes ; then
- _gl='#define HAVE_GL'
- _vosrc=$_vosrc' vo_gl.c vo_gl2.c'
+ if test "$_vo2" = no ; then
+  _gl='#define HAVE_GL'
+  _vosrc=$_vosrc' vo_gl.c vo_gl2.c'
+ else
+  _gl='#undef HAVE_GL'
+ fi
 else
  _gl='#undef HAVE_GL'
 fi
 
 if test "$_sdl" = yes ; then
- _sdldef='#define HAVE_SDL'
- _vosrc=$_vosrc' vo_sdl.c'
  _aosrc=$_aosrc' ao_sdl.c'
+ if test "$_vo2" = no ; then
+  _sdldef='#define HAVE_SDL'
+  _vosrc=$_vosrc' vo_sdl.c'
+ else
+  _sdldef='#undef HAVE_SDL'
+ fi
 else
  _sdldef='#undef HAVE_SDL'
 fi
 
 if test "$_ggi" = yes ; then
- _ggi='#define HAVE_GGI'
- _vosrc=$_vosrc' vo_ggi.c'
+ if test "$_vo2" = no ; then
+  _ggi='#define HAVE_GGI'
+  _vosrc=$_vosrc' vo_ggi.c'
+ else
+  _ggi='#undef HAVE_GGI'
+ fi
 else
  _ggi='#undef HAVE_GGI'
 fi
 
 if test "$_x11" = yes ; then
- _x11='#define HAVE_X11'
- _vosrc=$_vosrc' vo_x11.c'
+ if test "$_vo2" = no ; then
+  _x11='#define HAVE_X11'
+  _vosrc=$_vosrc' vo_x11.c'
+ else
+  _x11='#undef HAVE_X11'
+ fi
 else
  _x11='#undef HAVE_X11'
 fi
 
 if test "$_xv" = yes ; then
- _xv='#define HAVE_XV'
- _vosrc=$_vosrc' vo_xv.c'
+ if test "$_vo2" = no ; then
+  _xv='#define HAVE_XV'
+  _vosrc=$_vosrc' vo_xv.c'
+ else
+  _xv='#undef HAVE_XV'
+ fi
 else
  _xv='#undef HAVE_XV'
 fi
@@ -2439,59 +2481,91 @@
 fi
 
 if test "$_mga" = yes ; then
- _mga='#define HAVE_MGA'
- _vosrc=$_vosrc' vo_mga.c'
+ if test "$_vo2" = no ; then
+  _mga='#define HAVE_MGA'
+  _vosrc=$_vosrc' vo_mga.c'
+ else
+  _mga='#undef HAVE_MGA'
+ fi
 else
  _mga='#undef HAVE_MGA'
 fi
 
 if test "$_xmga" = yes ; then
- _vosrc=$_vosrc' vo_xmga.c'
- _xmga='#define HAVE_XMGA'
+ if test "$_vo2" = no ; then
+  _vosrc=$_vosrc' vo_xmga.c'
+  _xmga='#define HAVE_XMGA'
+ else
+  _xmga='#define HAVE_XMGA'
+ fi
 else
  _xmga='#undef HAVE_XMGA' 
 fi
 
 if test "$_syncfb" = yes ; then
- _syncfb='#define HAVE_SYNCFB'
- _vosrc=$_vosrc' vo_syncfb.c'
+ if test "$_vo2" = no ; then
+  _syncfb='#define HAVE_SYNCFB'
+  _vosrc=$_vosrc' vo_syncfb.c'
+ else
+  _syncfb='#undef HAVE_SYNCFB'
+ fi
 else
  _syncfb='#undef HAVE_SYNCFB'
 fi
 
 if test "$_3dfx" = yes ; then
- _3dfx='#define HAVE_3DFX'
- _vosrc=$_vosrc' vo_3dfx.c'
+ if test "$_vo2" = no ; then
+  _3dfx='#define HAVE_3DFX'
+  _vosrc=$_vosrc' vo_3dfx.c'
+ else
+  _3dfx='#undef HAVE_3DFX'
+ fi
 else
  _3dfx='#undef HAVE_3DFX'
 fi
 
 if test "$_tdfxfb" = yes ; then
- _tdfxfb='#define HAVE_TDFXFB'
- _vosrc=$_vosrc' vo_tdfxfb.c'
+ if test "$_vo2" = no ; then
+  _tdfxfb='#define HAVE_TDFXFB'
+  _vosrc=$_vosrc' vo_tdfxfb.c'
+ else
+  _tdfxfb='#undef HAVE_TDFXFB'
+ fi
 else
  _tdfxfb='#undef HAVE_TDFXFB'
 fi
 
 if test "$_svga" = yes ; then
- _svga='#define HAVE_SVGALIB'
- _vosrc=$_vosrc' vo_svga.c'
+ if test "$_vo2" = no ; then
+  _svga='#define HAVE_SVGALIB'
+  _vosrc=$_vosrc' vo_svga.c'
+ else
+  _svga='#undef HAVE_SVGALIB'
+ fi
 else
  _svga='#undef HAVE_SVGALIB'
 fi
 
 if test "$_dga" = yes ; then
- _dga='#define HAVE_DGA'
-# _vosrc=$_vosrc' vo_dga.c vo_fsdga.c'
- _vosrc=$_vosrc' vo_dga.c'
+ if test "$_vo2" = no ; then
+  _dga='#define HAVE_DGA'
+#  _vosrc=$_vosrc' vo_dga.c vo_fsdga.c'
+  _vosrc=$_vosrc' vo_dga.c'
+ else
+  _dga='#undef HAVE_DGA'
+ fi
 else
  _dga='#undef HAVE_DGA'
 fi
 
 if test "$_dga2" = yes ; then
- _dga2='#define HAVE_DGA2'
-# _vosrc=$_vosrc' vo_dga.c vo_fsdga.c'
- _vosrc=$_vosrc' vo_dga.c'
+ if test "$_vo2" = no ; then
+  _dga2='#define HAVE_DGA2'
+#  _vosrc=$_vosrc' vo_dga.c vo_fsdga.c'
+  _vosrc=$_vosrc' vo_dga.c'
+ else
+  _dga2='#undef HAVE_DGA2'
+ fi
 else
  _dga2='#undef HAVE_DGA2'
 fi
@@ -2503,8 +2577,12 @@
 fi
 
 if test "$_fbdev" = yes ; then
- _fbdev='#define HAVE_FBDEV'
- _vosrc=$_vosrc' vo_fbdev.c'
+ if test "$_vo2" = no ; then
+  _fbdev='#define HAVE_FBDEV'
+  _vosrc=$_vosrc' vo_fbdev.c'
+ else
+  _fbdev='#undef HAVE_FBDEV'
+ fi
 else
  _fbdev='#undef HAVE_FBDEV'
 fi
@@ -2521,24 +2599,16 @@
  _tv='#undef USE_TV'
 fi
 
-if test "$_vo2" = yes ; then
- _vodef='-DUSE_LIBVO2'
- _volib='-Llibvo2 -lvo2'
- _voinc='-Ilibvo2'
- _vodir='libvo2'
-else
- _vodef=''
- _volib='-Llibvo -lvo'
- _voinc='-Ilibvo'
- _vodir='libvo'
- _aosrc=$_aosrc' ao_mpegpes.c'
-fi
 
 if test "$_dxr3" = yes ; then
- _dxr3='#define HAVE_DXR3'
- _dxr3lib='-ldxr3'
- _vosrc=$_vosrc' vo_dxr3.c'
  _aosrc=$_aosrc' ao_dxr3.c'
+ if test "$_vo2" = no ; then
+  _dxr3='#define HAVE_DXR3'
+  _dxr3lib='-ldxr3'
+  _vosrc=$_vosrc' vo_dxr3.c'  
+ else
+  _dxr3='#undef HAVE_DXR3'
+ fi
 else
  _dxr3='#undef HAVE_DXR3'
 fi

Index: dec_video.c
===================================================================
RCS file: /cvsroot/mplayer/main/dec_video.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- dec_video.c	11 Nov 2001 13:35:00 -0000	1.63
+++ dec_video.c	14 Nov 2001 13:17:51 -0000	1.64
@@ -25,8 +25,10 @@
 
 #ifdef USE_LIBVO2
 #include "libvo2/libvo2.h"
+#include "libvo2/img_format.h"
 #else
 #include "libvo/video_out.h"
+#include "libvo/img_format.h"
 #endif
 
 #include "dec_video.h"




More information about the MPlayer-cvslog mailing list