diff options
author | joey <joey@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-12-21 20:31:39 +0000 |
---|---|---|
committer | joey <joey@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-12-21 20:31:39 +0000 |
commit | 90700b67a7626f4fc24903c716ae6c58ca3452b1 (patch) | |
tree | 0d3345ed95478f943217f6f1562ecb27ab4cc258 | |
parent | f78f7e615f472cd0bb5bb593631af683e931396c (diff) | |
download | mpv-90700b67a7626f4fc24903c716ae6c58ca3452b1.tar.bz2 mpv-90700b67a7626f4fc24903c716ae6c58ca3452b1.tar.xz |
added colorkey support for vo_directx.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14206 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | DOCS/man/en/mplayer.1 | 4 | ||||
-rw-r--r-- | libvo/vo_directx.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index bf9192bbf1..70c3019d69 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -462,8 +462,8 @@ only video (you can think of that as infinite fps). .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 diff --git a/libvo/vo_directx.c b/libvo/vo_directx.c index 850c41aec7..6811b2497e 100644 --- a/libvo/vo_directx.c +++ b/libvo/vo_directx.c @@ -79,6 +79,7 @@ extern int vo_directrendering; extern int vo_ontop; extern int vo_rootwin; extern int vidmode; +extern int vo_colorkey; /***************************************************************************** * DirectDraw GUIDs. @@ -978,6 +979,7 @@ static uint32_t preinit(const char *arg) 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; |