* modules/video_output/directx/*: fixed overlay on 24bpp displays.

diff --git a/modules/video_output/directx/directx.c b/modules/video_output/directx/directx.c
index 3971dcc439cfaff93de734719812ba22e9f4ae69..9b69088c96fb9e907b63f7e964cea571d5bce55a 100644 (file)
--- a/modules/video_output/directx/directx.c
+++ b/modules/video_output/directx/directx.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * vout.c: Windows DirectX video output display method
  *****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: directx.c,v 1.30 2003/12/23 02:11:27 gbazin Exp $
+ * Copyright (C) 2001-2004 VideoLAN
+ * $Id: directx.c,v 1.31 2004/01/02 22:17:57 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -1662,10 +1662,7 @@ static DWORD DirectXFindColorkey( vout_thread_t *p_vout, uint32_t i_color )
     case 16:
         *(uint16_t *)ddsd.lpSurface = 0x01;
         break;
-    case 24:
-        *(uint32_t *)ddsd.lpSurface = 0x0100;
-        break;
-    case 32:
+    default:
         *(uint32_t *)ddsd.lpSurface = 0x01;
         break;
     }

diff --git a/modules/video_output/directx/events.c b/modules/video_output/directx/events.c
index c8781eb750beee53ec7f7024298348600e1f1144..2da5b915ff6c9cc173cc9c5486537a9a71876108 100644 (file)
--- a/modules/video_output/directx/events.c
+++ b/modules/video_output/directx/events.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * events.c: Windows DirectX video output events handler
  *****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: events.c,v 1.36 2003/12/23 17:10:18 gbazin Exp $
+ * Copyright (C) 2001-2004 VideoLAN
+ * $Id: events.c,v 1.37 2004/01/02 22:17:57 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *

diff --git a/modules/video_output/directx/vout.h b/modules/video_output/directx/vout.h
index a75466f2083134e0e587dbea32f1fc274075668f..5bb38f82ea81d13c9d4a5391383ec1588a541fcd 100644 (file)
--- a/modules/video_output/directx/vout.h
+++ b/modules/video_output/directx/vout.h
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * vout.h: Windows DirectX video output header file
  *****************************************************************************
- * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: vout.h,v 1.11 2003/12/23 02:11:27 gbazin Exp $
+ * Copyright (C) 2001-2004 VideoLAN
+ * $Id: vout.h,v 1.12 2004/01/02 22:17:57 gbazin Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *