d3d11: Use library private header in plugin

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2697>

diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/gstd3d11_private.h b/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/gstd3d11_private.h
index ab159a9..872b169 100644 (file)
--- a/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/gstd3d11_private.h
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/gstd3d11_private.h
@@ -24,7 +24,7 @@
 #include <gst/d3d11/gstd3d11_fwd.h>
 #include <d3d11_4.h>
 #include <dxgi1_6.h>
-#include "gstd3d11format.h"
+#include <gst/d3d11/gstd3d11format.h>
 
 G_BEGIN_DECLS
 

diff --git a/subprojects/gst-plugins-bad/sys/d3d11/gstd3d11pluginutils.h b/subprojects/gst-plugins-bad/sys/d3d11/gstd3d11pluginutils.h
index 226b1e1..7ffdafb 100644 (file)
--- a/subprojects/gst-plugins-bad/sys/d3d11/gstd3d11pluginutils.h
+++ b/subprojects/gst-plugins-bad/sys/d3d11/gstd3d11pluginutils.h
@@ -24,8 +24,7 @@
 #include <gst/gst.h>
 #include <gst/video/video.h>
 #include <gst/d3d11/gstd3d11.h>
-#include <d3d11_4.h>
-#include <dxgi1_6.h>
+#include <gst/d3d11/gstd3d11_private.h>
 
 G_BEGIN_DECLS
 
@@ -56,13 +55,6 @@ typedef struct _GstD3D11ColorMatrix
   gdouble max[3];
 } GstD3D11ColorMatrix;
 
-#define GST_D3D11_CLEAR_COM(obj) G_STMT_START { \
-    if (obj) { \
-      (obj)->Release (); \
-      (obj) = NULL; \
-    } \
-  } G_STMT_END
-
 void            gst_d3d11_plugin_utils_init         (D3D_FEATURE_LEVEL feature_level);
 
 GstCaps *       gst_d3d11_get_updated_template_caps (GstStaticCaps * template_caps);