vlc | branch: master | Steve Lhomme <rob...@ycbcr.xyz> | Fri Nov 30 11:44:01 2018 +0100| [b8a120ea5330b539530328f692196c8f77eaea36] | committer: Steve Lhomme
direct3d11: fix compilation warnings > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b8a120ea5330b539530328f692196c8f77eaea36 --- modules/video_output/win32/d3d11_quad.c | 2 +- modules/video_output/win32/direct3d11.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/video_output/win32/d3d11_quad.c b/modules/video_output/win32/d3d11_quad.c index 894449ca7c..b1648cc342 100644 --- a/modules/video_output/win32/d3d11_quad.c +++ b/modules/video_output/win32/d3d11_quad.c @@ -85,7 +85,7 @@ void D3D11_RenderQuad(d3d11_device_t *d3d_dev, d3d_quad_t *quad, d3d_vshader_t * /* force unbinding the input texture, otherwise we get: * OMSetRenderTargets: Resource being set to OM RenderTarget slot 0 is still bound on input! */ - ID3D11RenderTargetView *reset[D3D11_MAX_SHADER_VIEW] = { 0 }; + ID3D11ShaderResourceView *reset[D3D11_MAX_SHADER_VIEW] = { 0 }; ID3D11DeviceContext_PSSetShaderResources(d3d_dev->d3dcontext, 0, quad->resourceCount, reset); } diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c index d59cee71ef..50d83e6107 100644 --- a/modules/video_output/win32/direct3d11.c +++ b/modules/video_output/win32/direct3d11.c @@ -355,7 +355,7 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg, } #endif - vout_display_sys_t *sys = vd->sys = vlc_obj_calloc(vd, 1, sizeof(vout_display_sys_t)); + vout_display_sys_t *sys = vd->sys = vlc_obj_calloc(VLC_OBJECT(vd), 1, sizeof(vout_display_sys_t)); if (!sys) return VLC_ENOMEM; _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits