[vlc-commits] d3d11_fmt: make D3D11_CreateDeviceExternal private

Steve Lhomme git at videolan.org
Thu Feb 13 09:31:47 CET 2020


vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Feb 12 15:50:45 2020 +0100| [c3fe4383a55715688bddaf725575446cc9775d6d] | committer: Steve Lhomme

d3d11_fmt: make D3D11_CreateDeviceExternal private

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c3fe4383a55715688bddaf725575446cc9775d6d
---

 modules/video_chroma/d3d11_fmt.c | 3 +--
 modules/video_chroma/d3d11_fmt.h | 4 ----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/modules/video_chroma/d3d11_fmt.c b/modules/video_chroma/d3d11_fmt.c
index 0c6ffa3887..49db979efc 100644
--- a/modules/video_chroma/d3d11_fmt.c
+++ b/modules/video_chroma/d3d11_fmt.c
@@ -319,8 +319,7 @@ void D3D11_ReleaseDevice(d3d11_decoder_device_t *dev_sys)
     D3D11_Destroy( &sys->hd3d );
 }
 
-#undef D3D11_CreateDeviceExternal
-HRESULT D3D11_CreateDeviceExternal(vlc_object_t *obj, ID3D11DeviceContext *d3d11ctx,
+static HRESULT D3D11_CreateDeviceExternal(vlc_object_t *obj, ID3D11DeviceContext *d3d11ctx,
                                    bool hw_decoding, d3d11_device_t *out)
 {
     HRESULT hr;
diff --git a/modules/video_chroma/d3d11_fmt.h b/modules/video_chroma/d3d11_fmt.h
index 53258bcdc0..e7ad41fcea 100644
--- a/modules/video_chroma/d3d11_fmt.h
+++ b/modules/video_chroma/d3d11_fmt.h
@@ -139,10 +139,6 @@ int D3D11_AllocateResourceView(vlc_object_t *obj, ID3D11Device *d3ddevice,
 d3d11_decoder_device_t *D3D11_CreateDevice(vlc_object_t *obj, IDXGIAdapter *,
                                    bool hw_decoding, bool forced);
 #define D3D11_CreateDevice(a,b,c,d)  D3D11_CreateDevice( VLC_OBJECT(a), b, c, d )
-HRESULT D3D11_CreateDeviceExternal(vlc_object_t *obj, ID3D11DeviceContext *,
-                                   bool hw_decoding, d3d11_device_t *out);
-#define D3D11_CreateDeviceExternal(a,b,c,d) \
-    D3D11_CreateDeviceExternal( VLC_OBJECT(a), b, c, d )
 
 void D3D11_ReleaseDevice(d3d11_decoder_device_t *);
 



More information about the vlc-commits mailing list