diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-05-08 23:50:26 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-05-08 23:50:26 +0300 |
commit | 1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07 (patch) | |
tree | c5e99bfe0e69cd37fb8ac70fadf00ce54a1cbe3c /libvo/vo_directx.c | |
parent | f2864e9a072f53c38a04dd7c44392521777dc908 (diff) | |
parent | 86c9fb2e8930de031807513c9b93d47394d2d2fa (diff) | |
download | mpv-1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07.tar.bz2 mpv-1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07.tar.xz |
Merge svn changes up to r29277
Diffstat (limited to 'libvo/vo_directx.c')
-rw-r--r-- | libvo/vo_directx.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libvo/vo_directx.c b/libvo/vo_directx.c index 7d4feaa5e5..32328ae4fd 100644 --- a/libvo/vo_directx.c +++ b/libvo/vo_directx.c @@ -198,7 +198,7 @@ query_format(uint32_t format) return 0; } -static uint32_t Directx_CreatePrimarySurface() +static uint32_t Directx_CreatePrimarySurface(void) { DDSURFACEDESC2 ddsd; //cleanup @@ -308,7 +308,7 @@ static uint32_t Directx_CreateOverlay(uint32_t imgfmt) return 0; } -static uint32_t Directx_CreateBackpuffer() +static uint32_t Directx_CreateBackpuffer(void) { DDSURFACEDESC2 ddsd; //cleanup @@ -414,7 +414,7 @@ static BOOL WINAPI EnumCallbackEx(GUID FAR *lpGUID, LPSTR lpDriverDescription, L return 1; // list all adapters } -static uint32_t Directx_InitDirectDraw() +static uint32_t Directx_InitDirectDraw(void) { HRESULT (WINAPI *OurDirectDrawCreateEx)(GUID *,LPVOID *, REFIID,IUnknown FAR *); DDSURFACEDESC2 ddsd; @@ -531,7 +531,7 @@ static void check_events(void) } } -static uint32_t Directx_ManageDisplay() +static uint32_t Directx_ManageDisplay(void) { HRESULT ddrval; DDCAPS capsDrv; @@ -761,7 +761,7 @@ static uint32_t Directx_ManageDisplay() } //find out supported overlay pixelformats -static uint32_t Directx_CheckOverlayPixelformats() +static uint32_t Directx_CheckOverlayPixelformats(void) { DDCAPS capsDrv; HRESULT ddrval; @@ -822,7 +822,7 @@ static uint32_t Directx_CheckOverlayPixelformats() } //find out the Pixelformat of the Primary Surface -static uint32_t Directx_CheckPrimaryPixelformat() +static uint32_t Directx_CheckPrimaryPixelformat(void) { uint32_t i=0; uint32_t formatcount = 0; |