[Mplayer-cvslog] CVS: main/libvo geometry.c,1.2,1.3 vo_gl2.c,1.28,1.29 vosub_vidix.c,1.55,1.56 vo_xvidix.c,1.55,1.56

[Michael Niedermayer CVS]

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv22743/libvo

Modified Files:
	geometry.c vo_gl2.c vosub_vidix.c vo_xvidix.c 
Log Message:
warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)


Index: geometry.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/geometry.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- geometry.c	6 Nov 2002 23:54:27 -0000	1.2
+++ geometry.c	23 Nov 2002 10:58:07 -0000	1.3
@@ -2,7 +2,7 @@
 
 #include "geometry.h"
 #include "../mp_msg.h"
-// #include "../mplayer.h" /* exit_player() */
+#include "../mplayer.h" /* exit_player() */
 #include <string.h>
 #include <stdlib.h> /* strtol */
 

Index: vo_gl2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl2.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- vo_gl2.c	11 Nov 2002 15:20:26 -0000	1.28
+++ vo_gl2.c	23 Nov 2002 10:58:07 -0000	1.29
@@ -472,7 +472,7 @@
 static void drawTextureDisplay ()
 {
   struct TexSquare *square;
-  int x, y, xoff=0, yoff=0, wd, ht;
+  int x, y/*, xoff=0, yoff=0, wd, ht*/;
   GLenum err;
 
   glColor3f(1.0,1.0,1.0);

Index: vosub_vidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- vosub_vidix.c	10 Oct 2002 00:09:34 -0000	1.55
+++ vosub_vidix.c	23 Nov 2002 10:58:07 -0000	1.56
@@ -49,7 +49,7 @@
 static vidix_fourcc_t	  vidix_fourcc;
 static vo_functions_t *   vo_server;
 static vidix_yuv_t	  dstrides;
-static uint32_t (*server_control)(uint32_t request, void *data, ...);
+/*static uint32_t (*server_control)(uint32_t request, void *data, ...);*/
 
 static int  vidix_get_video_eq(vidix_video_eq_t *info);
 static int  vidix_set_video_eq(const vidix_video_eq_t *info);

Index: vo_xvidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xvidix.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- vo_xvidix.c	11 Nov 2002 15:20:26 -0000	1.55
+++ vo_xvidix.c	23 Nov 2002 10:58:07 -0000	1.56
@@ -32,6 +32,7 @@
 
 #include "vosub_vidix.h"
 #include "../vidix/vidixlib.h"
+#include "../mplayer.h" /* exit_player() */
 
 #ifdef HAVE_NEW_GUI
 #include "../Gui/interface.h"