diff options
| -rw-r--r-- | osdep/win32-console-wrapper.c | 6 | ||||
| -rw-r--r-- | video/out/vo.c | 2 | ||||
| -rw-r--r-- | video/out/vo_direct3d.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/osdep/win32-console-wrapper.c b/osdep/win32-console-wrapper.c index 778d699161..ff69f9aee1 100644 --- a/osdep/win32-console-wrapper.c +++ b/osdep/win32-console-wrapper.c @@ -36,8 +36,8 @@ void cr_perror(const wchar_t *prefix) int cr_runproc(wchar_t *name, wchar_t *cmdline) { - STARTUPINFO si; - STARTUPINFO our_si; + STARTUPINFOW si; + STARTUPINFOW our_si; PROCESS_INFORMATION pi; DWORD retval = 1; @@ -50,7 +50,7 @@ int cr_runproc(wchar_t *name, wchar_t *cmdline) // Copy the list of inherited CRT file descriptors to the new process our_si.cb = sizeof(our_si); - GetStartupInfo(&our_si); + GetStartupInfoW(&our_si); si.lpReserved2 = our_si.lpReserved2; si.cbReserved2 = our_si.cbReserved2; diff --git a/video/out/vo.c b/video/out/vo.c index 296be634ad..cbd2ca87c8 100644 --- a/video/out/vo.c +++ b/video/out/vo.c @@ -401,7 +401,7 @@ static void vsync_skip_detection(struct vo *vo) } int64_t desync = diff / in->num_vsync_samples; if (in->drop_point > window * 2 && - labs(desync - desync_early) >= in->vsync_interval * 3 / 4) + llabs(desync - desync_early) >= in->vsync_interval * 3 / 4) { // Assume a drop. An underflow can technically speaking not be a drop // (it's up to the driver what this is supposed to mean), but no reason diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c index 38dde55af2..c99ea372f6 100644 --- a/video/out/vo_direct3d.c +++ b/video/out/vo_direct3d.c @@ -1466,13 +1466,13 @@ static mp_image_t *get_window_screenshot(d3d_priv *priv) POINT pt; D3DLOCKED_RECT locked_rect; int width, height; + IDirect3DSurface9 *surface = NULL; if (FAILED(IDirect3DDevice9_GetDisplayMode(priv->d3d_device, 0, &mode))) { MP_ERR(priv, "GetDisplayMode failed.\n"); goto error_exit; } - IDirect3DSurface9 *surface = NULL; if (FAILED(IDirect3DDevice9_CreateOffscreenPlainSurface(priv->d3d_device, mode.Width, mode.Height, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &surface, NULL))) |