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.
kevmitch · Dec 1, 2017 · 9f52a92 · 9f52a92
1 parent 1e44540
commit 9f52a92
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 6 deletions.
diff --git a/video/decode/d3d.c → video/d3d.c b/video/decode/d3d.c → video/d3d.c
diff --git a/video/decode/d3d.h → video/d3d.h b/video/decode/d3d.h → video/d3d.h
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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>

diff --git a/wscript_build.py b/wscript_build.py
@@ -350,6 +350,7 @@ def build(ctx):
 
         ## Video
         ( "video/csputils.c" ),
+        ( "video/d3d.c",                         "d3d-hwaccel" ),
         ( "video/fmt-conversion.c" ),
         ( "video/image_loader.c" ),
         ( "video/image_writer.c" ),
@@ -361,7 +362,6 @@ def build(ctx):
         ( "video/vaapi.c",                       "vaapi" ),
         ( "video/vdpau.c",                       "vdpau" ),
         ( "video/vdpau_mixer.c",                 "vdpau" ),
-        ( "video/decode/d3d.c",                  "d3d-hwaccel" ),
         ( "video/decode/dec_video.c"),
         ( "video/decode/hw_mediacodec.c",        "android" ),
         ( "video/decode/vd_lavc.c" ),