diff options
| author | wm4 <wm4@nowhere> | 2017-12-01 17:51:39 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-12-01 17:58:56 +0100 |
| commit | 9f52a92899db1acf8ae630d5d06c28eb6be652c6 (patch) | |
| tree | d221bb44cd0ea2211e0592421bcd89ba517b8269 /video | |
| parent | 1e4454090683b4cbc20f4422a531eb363ad76092 (diff) | |
| download | mpv-9f52a92899db1acf8ae630d5d06c28eb6be652c6.tar.bz2 mpv-9f52a92899db1acf8ae630d5d06c28eb6be652c6.tar.xz | |
video: move d3d.c out of decode sub directory
It makes more sense to have it in the general video directory (along
with vdpau.c and vaapi.c), since the decoder source files don't even
access it anymore.
Diffstat (limited to 'video')
| -rw-r--r-- | video/d3d.c (renamed from video/decode/d3d.c) | 0 | ||||
| -rw-r--r-- | video/d3d.h (renamed from video/decode/d3d.h) | 0 | ||||
| -rw-r--r-- | video/out/d3d11/hwdec_d3d11va.c | 2 | ||||
| -rw-r--r-- | video/out/opengl/hwdec_d3d11egl.c | 2 | ||||
| -rw-r--r-- | video/out/opengl/hwdec_d3d11eglrgb.c | 2 | ||||
| -rw-r--r-- | video/out/opengl/hwdec_dxva2egl.c | 2 | ||||
| -rw-r--r-- | video/out/opengl/hwdec_dxva2gldx.c | 2 |
7 files changed, 5 insertions, 5 deletions
diff --git a/video/decode/d3d.c b/video/d3d.c index 8f04dcd0d6..8f04dcd0d6 100644 --- a/video/decode/d3d.c +++ b/video/d3d.c diff --git a/video/decode/d3d.h b/video/d3d.h index 0058905a27..0058905a27 100644 --- a/video/decode/d3d.h +++ b/video/d3d.h diff --git a/video/out/d3d11/hwdec_d3d11va.c b/video/out/d3d11/hwdec_d3d11va.c index d6cbe31bdc..1be79a3748 100644 --- a/video/out/d3d11/hwdec_d3d11va.c +++ b/video/out/d3d11/hwdec_d3d11va.c @@ -25,7 +25,7 @@ #include "options/m_config.h" #include "osdep/windows_utils.h" #include "video/hwdec.h" -#include "video/decode/d3d.h" +#include "video/d3d.h" #include "video/out/d3d11/ra_d3d11.h" #include "video/out/gpu/hwdec.h" diff --git a/video/out/opengl/hwdec_d3d11egl.c b/video/out/opengl/hwdec_d3d11egl.c index ca49a5d0e6..e2b188f4b5 100644 --- a/video/out/opengl/hwdec_d3d11egl.c +++ b/video/out/opengl/hwdec_d3d11egl.c @@ -30,7 +30,7 @@ #include "video/out/gpu/hwdec.h" #include "ra_gl.h" #include "video/hwdec.h" -#include "video/decode/d3d.h" +#include "video/d3d.h" #ifndef EGL_D3D_TEXTURE_SUBRESOURCE_ID_ANGLE #define EGL_D3D_TEXTURE_SUBRESOURCE_ID_ANGLE 0x33AB diff --git a/video/out/opengl/hwdec_d3d11eglrgb.c b/video/out/opengl/hwdec_d3d11eglrgb.c index 0e201f7a6d..78bc38e93e 100644 --- a/video/out/opengl/hwdec_d3d11eglrgb.c +++ b/video/out/opengl/hwdec_d3d11eglrgb.c @@ -30,7 +30,7 @@ #include "video/out/gpu/hwdec.h" #include "ra_gl.h" #include "video/hwdec.h" -#include "video/decode/d3d.h" +#include "video/d3d.h" #ifndef EGL_D3D_TEXTURE_SUBRESOURCE_ID_ANGLE #define EGL_D3D_TEXTURE_SUBRESOURCE_ID_ANGLE 0x3AAB diff --git a/video/out/opengl/hwdec_dxva2egl.c b/video/out/opengl/hwdec_dxva2egl.c index 298c1eb4ef..838cc80c8d 100644 --- a/video/out/opengl/hwdec_dxva2egl.c +++ b/video/out/opengl/hwdec_dxva2egl.c @@ -30,7 +30,7 @@ #include "video/out/gpu/hwdec.h" #include "ra_gl.h" #include "video/hwdec.h" -#include "video/decode/d3d.h" +#include "video/d3d.h" struct priv_owner { struct mp_hwdec_ctx hwctx; diff --git a/video/out/opengl/hwdec_dxva2gldx.c b/video/out/opengl/hwdec_dxva2gldx.c index 46f3b23df7..895a7c4af1 100644 --- a/video/out/opengl/hwdec_dxva2gldx.c +++ b/video/out/opengl/hwdec_dxva2gldx.c @@ -23,7 +23,7 @@ #include "video/out/gpu/hwdec.h" #include "ra_gl.h" #include "video/hwdec.h" -#include "video/decode/d3d.h" +#include "video/d3d.h" // for WGL_ACCESS_READ_ONLY_NV #include <GL/wglext.h> |