Mercurial > mplayer.hg

changeset 14205:87148f636da2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added colorkey support for vo_directx.
author joey
date Tue, 21 Dec 2004 20:31:39 +0000
parents 05b78d7d444e
children 9c58002671d5
files DOCS/man/en/mplayer.1 libvo/vo_directx.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/DOCS/man/en/mplayer.1	Tue Dec 21 17:14:39 2004 +0000
+++ b/DOCS/man/en/mplayer.1	Tue Dec 21 20:31:39 2004 +0000
@@ -462,8 +462,8 @@
 .B \-colorkey <number>
 Changes the colorkey to an RGB value of your choice.
 0x000000 is black and 0xffffff is white.
-Only supported by the cvidix, fbdev, svga, vesa, winvidix, xmga, xvidix and
-xover video out drivers.
+Only supported by the cvidix, fbdev, svga, vesa, winvidix, xmga, xvidix,
+xover and directx video out drivers.
 .
 .TP
 .B \-nocolorkey
--- a/libvo/vo_directx.c	Tue Dec 21 17:14:39 2004 +0000
+++ b/libvo/vo_directx.c	Tue Dec 21 20:31:39 2004 +0000
@@ -79,6 +79,7 @@
 extern int vo_ontop;
 extern int vo_rootwin;
 extern int vidmode;
+extern int vo_colorkey;
 
 /*****************************************************************************
  * DirectDraw GUIDs.
@@ -978,6 +979,7 @@
     monitor_rect.right=GetSystemMetrics(SM_CXSCREEN);
     monitor_rect.bottom=GetSystemMetrics(SM_CYSCREEN);
 	
+    windowcolor = vo_colorkey;
     wc.style         =  CS_HREDRAW | CS_VREDRAW;
     wc.lpfnWndProc   =  WndProc;
     wc.cbClsExtra    =  0;