diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-07-10 01:06:17 +0200 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-07-10 01:06:17 +0200 |
| commit | 76354385929b76b02b8c32a7b1cd4d669a8f2e0a (patch) | |
| tree | 738a432ac5648098cf93101bf64a010cff47486a /video/out/opengl/hwdec_d3d11eglrgb.c | |
| parent | 69e7b0d3ea4b75a8040ede5b9b7e6fa93ec68056 (diff) | |
| parent | e518bf2c72fc862fbe1de1c98313a03fa0db2e98 (diff) | |
| download | mpv-76354385929b76b02b8c32a7b1cd4d669a8f2e0a.tar.bz2 mpv-76354385929b76b02b8c32a7b1cd4d669a8f2e0a.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'video/out/opengl/hwdec_d3d11eglrgb.c')
| -rw-r--r-- | video/out/opengl/hwdec_d3d11eglrgb.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/video/out/opengl/hwdec_d3d11eglrgb.c b/video/out/opengl/hwdec_d3d11eglrgb.c index 2e61189154..be8057cde3 100644 --- a/video/out/opengl/hwdec_d3d11eglrgb.c +++ b/video/out/opengl/hwdec_d3d11eglrgb.c @@ -23,7 +23,6 @@ #include <EGL/egl.h> #include <EGL/eglext.h> -#include "angle_common.h" #include "angle_dynamic.h" #include "common/common.h" @@ -31,6 +30,7 @@ #include "osdep/windows_utils.h" #include "hwdec.h" #include "video/hwdec.h" +#include "video/decode/d3d.h" #ifndef EGL_D3D_TEXTURE_SUBRESOURCE_ID_ANGLE #define EGL_D3D_TEXTURE_SUBRESOURCE_ID_ANGLE 0x3AAB @@ -87,6 +87,8 @@ static int create(struct gl_hwdec *hw) if (!angle_load()) return -1; + d3d_load_dlls(); + EGLDisplay egl_display = eglGetCurrentDisplay(); if (!egl_display) return -1; @@ -104,7 +106,6 @@ static int create(struct gl_hwdec *hw) p->egl_display = egl_display; - HANDLE d3d11_dll = GetModuleHandleW(L"d3d11.dll"); if (!d3d11_dll) { if (!hw->probing) MP_ERR(hw, "Failed to load D3D11 library\n"); |