Mercurial > mplayer.hg

changeset 10495:81e99e4c6640

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
10l & warning fixes
author alex
date Mon, 28 Jul 2003 14:54:19 +0000
parents db0bc96da95f
children 5fd0864becc3
files libvo/vo_dga.c
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_dga.c	Mon Jul 28 14:17:31 2003 +0000
+++ b/libvo/vo_dga.c	Mon Jul 28 14:54:19 2003 +0000
@@ -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
 
 //---------------------------------------------------------