diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-25 15:36:38 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-25 15:36:38 +0200 |
| commit | 4ebf0075806ccf2bdde276a4e56eac41c7e350c4 (patch) | |
| tree | 89b4572543527808c92f4e37448bca4012e926ad /libvo/vo_directx.c | |
| parent | efd25f7811b232ae2b1899ca0fee6fd598837b9f (diff) | |
| parent | c2ba58aefce038ce4ccf6ed23791f5de823aa041 (diff) | |
| download | mpv-4ebf0075806ccf2bdde276a4e56eac41c7e350c4.tar.bz2 mpv-4ebf0075806ccf2bdde276a4e56eac41c7e350c4.tar.xz | |
Merge svn changes up to r30375
Diffstat (limited to 'libvo/vo_directx.c')
| -rw-r--r-- | libvo/vo_directx.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libvo/vo_directx.c b/libvo/vo_directx.c index a51a4314e5..00294b881d 100644 --- a/libvo/vo_directx.c +++ b/libvo/vo_directx.c @@ -91,12 +91,14 @@ static RECT last_rect = {0xDEADC0DE, 0xDEADC0DE, 0xDEADC0DE, 0xDEADC0DE}; * Defining them here allows us to get rid of the dxguid library during * the linking stage. *****************************************************************************/ -const GUID IID_IDirectDraw7 = +#define IID_IDirectDraw7 MP_IID_IDirectDraw7 +static const GUID MP_IID_IDirectDraw7 = { 0x15e65ec0,0x3b9c,0x11d2,{0xb9,0x2f,0x00,0x60,0x97,0x97,0xea,0x5b} }; -const GUID IID_IDirectDrawColorControl = +#define IID_IDirectDrawColorControl MP_IID_IDirectDrawColorControl +static const GUID MP_IID_IDirectDrawColorControl = { 0x4b9f0ee0,0x0d7e,0x11d0,{0x9b,0x06,0x00,0xa0,0xc9,0x03,0xa3,0xb8} }; |