Mercurial > mplayer.hg

diff vidix/nvidia_vid.c @ 27727:48c1ae64255b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__. This avoids a pointless indirection that only obscures what is really done.
author diego
date Mon, 13 Oct 2008 16:23:55 +0000
parents df448e1248b2
children b5a46071062a
line wrap: on
line diff
--- a/vidix/nvidia_vid.c	Mon Oct 13 16:06:15 2008 +0000
+++ b/vidix/nvidia_vid.c	Mon Oct 13 16:23:55 2008 +0000
@@ -614,13 +614,14 @@
 	switch (info->depth) {
 	case 15:
 		key = ((r >> 3) << 10) | ((g >> 3) << 5) | ((b >> 3));
-#ifndef WIN32
+
+#if !defined(__MINGW32__) && !defined(__CYGWIN__)
         key = key | 0x00008000;
 #endif       
 		break;
 	case 16: // XXX unchecked
 		key = ((r >> 3) << 11) | ((g >> 2) << 5) | ((b >> 3));
-#ifndef WIN32
+#if !defined(__MINGW32__) && !defined(__CYGWIN__)
         key = key | 0x00008000;
 #endif       
 		break;
@@ -629,7 +630,7 @@
 		break;
 	case 32:
 		key = chromakey;
-#ifndef WIN32
+#if !defined(__MINGW32__) && !defined(__CYGWIN__)
         key = key | 0x80000000;
 #endif       
 		break;