summaryrefslogtreecommitdiffstats
path: root/video/decode
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-07-30 21:50:11 +0200
committerwm4 <wm4@nowhere>2015-07-30 21:50:11 +0200
commitfefac2c941149fb49bcb5126060be74494d0c287 (patch)
tree9835f45627a3c3bbb18f8e037ed0ff5ea24606a8 /video/decode
parentc8fab7cc7b98af8da0bf734dbdb1a3efc5db977e (diff)
downloadmpv-fefac2c941149fb49bcb5126060be74494d0c287.tar.bz2
mpv-fefac2c941149fb49bcb5126060be74494d0c287.tar.xz
win32: more wchar_t -> WCHAR replacements
This was essentially missing from commit 0b52ac8a. Since L"..." string literals have the type wchar_t[], we can't use them for UTF-16 strings. Use C11 u"..." string literals instead. These have the type char16_t[], but we simply assume char16_t is the same underlying type as WCHAR. In practice, they're both unsigned short. For this reason use -std=c11 on Windows. Since Windows is a "special" environment (we require either MinGW or Cygwin), we don't need to worry too much about compiler compatibility.
Diffstat (limited to 'video/decode')
-rw-r--r--video/decode/dxva2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/video/decode/dxva2.c b/video/decode/dxva2.c
index c87093812c..d207aa504b 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 = LoadLibrary(L"d3d9.dll");
+ ctx->d3dlib = LoadLibraryW(u"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 = LoadLibrary(L"dxva2.dll");
+ ctx->dxva2lib = LoadLibraryW(u"dxva2.dll");
if (!ctx->dxva2lib) {
MP_ERR(ctx, "Failed to load DXVA2 library\n");
goto fail;