From 9f52a92899db1acf8ae630d5d06c28eb6be652c6 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 1 Dec 2017 17:51:39 +0100
Subject: [PATCH] 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.
---
 video/{decode => }/d3d.c             | 0
 video/{decode => }/d3d.h             | 0
 video/out/d3d11/hwdec_d3d11va.c      | 2 +-
 video/out/opengl/hwdec_d3d11egl.c    | 2 +-
 video/out/opengl/hwdec_d3d11eglrgb.c | 2 +-
 video/out/opengl/hwdec_dxva2egl.c    | 2 +-
 video/out/opengl/hwdec_dxva2gldx.c   | 2 +-
 wscript_build.py                     | 2 +-
 8 files changed, 6 insertions(+), 6 deletions(-)
 rename video/{decode => }/d3d.c (100%)
 rename video/{decode => }/d3d.h (100%)

diff --git a/video/decode/d3d.c b/video/d3d.c
similarity index 100%
rename from video/decode/d3d.c
rename to video/d3d.c
diff --git a/video/decode/d3d.h b/video/d3d.h
similarity index 100%
rename from video/decode/d3d.h
rename to 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>
diff --git a/wscript_build.py b/wscript_build.py
index 4a568c491f..83b4e8eca0 100644
--- 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" ),