[Mplayer-cvslog] CVS: main/libvo vo_dga.c,1.65,1.66

[Alex Beregszaszi]

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

Modified Files:
	vo_dga.c 
Log Message:
10l & warning fixes

Index: vo_dga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dga.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- vo_dga.c	13 Jun 2003 01:25:11 -0000	1.65
+++ vo_dga.c	28 Jul 2003 14:54:19 -0000	1.66
@@ -80,7 +80,7 @@
   // so the last two values describe, which HW mode to use and which conversion 
   // function to use for a mode that is not supported by HW
 
-  {  0,  0,  0,  0, 0,          0,          0, 0,      0, 0},
+  {  0,  0,  0,  0, 0,          0,          0, 0,      0, },
   { 15,  0, 15, 16, 2,     0x7c00,     0x03e0, 0x001f, 2, },
   { 16,  0, 16, 16, 2,     0xf800,     0x07e0, 0x001f, 2, },
   { 24,  0, 24, 24, 3,   0xff0000,   0x00ff00, 0x0000ff, 4},
@@ -165,7 +165,7 @@
 
 //-----------------------------------------------------------------
 
-#ifdef HAVE_XF86VM
+#if defined(HAVE_XF86VM) && !defined(HAVE_DGA2)
 static XF86VidModeModeInfo **vo_dga_vidmodes=NULL;
 #endif
 
@@ -250,7 +250,7 @@
 
 
 // quick & dirty - for debugging only 
-
+#if 0
 static void fillblock(char *strt, int yoff, int lines, int val){
   char *i;
   for(i = strt + yoff * vo_dga_width *HW_MODE.vdm_bytespp; 
@@ -258,7 +258,7 @@
     *i++ = val;
   }
 }
-
+#endif
 
 //---------------------------------------------------------