From 41101c2996262c47757bc3bbf39cc11bd7dc5f99 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 1 Aug 2015 20:51:52 +0200 Subject: win32: revert wchar_t changes Revert "win32: more wchar_t -> WCHAR replacements" Revert "win32: replace wchar_t with WCHAR" Doing a "partial" port of this makes no sense anymore from my perspective. Revert the changes, as they're confusing without context, maintenance, and progress. These changes were a bit premature anyway, and might actually cause other issues (locale neutrality etc. as it was pointed out). --- video/decode/dxva2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'video/decode/dxva2.c') diff --git a/video/decode/dxva2.c b/video/decode/dxva2.c index d207aa504b..c87093812c 100644 --- a/video/decode/dxva2.c +++ b/video/decode/dxva2.c @@ -355,7 +355,7 @@ static int create_device(struct lavc_ctx *s) } } - ctx->d3dlib = LoadLibraryW(u"d3d9.dll"); + ctx->d3dlib = LoadLibrary(L"d3d9.dll"); if (!ctx->d3dlib) { MP_ERR(ctx, "Failed to load D3D9 library\n"); goto fail; @@ -423,7 +423,7 @@ static int dxva2_init(struct lavc_ctx *s) ctx->deviceHandle = INVALID_HANDLE_VALUE; - ctx->dxva2lib = LoadLibraryW(u"dxva2.dll"); + ctx->dxva2lib = LoadLibrary(L"dxva2.dll"); if (!ctx->dxva2lib) { MP_ERR(ctx, "Failed to load DXVA2 library\n"); goto fail; -- cgit v1.2.3