vlc/vlc-3.0 | branch: master | Steve Lhomme <[email protected]> | Fri Nov 24 08:25:13 2017 +0100| [e9e79be6cdcf4e44b260da7e6da4f5421f02d36b] | committer: Steve Lhomme
d3d11_fmt: only list the remaining objects before unloading the DLLs (cherry picked from commit 97db6a846ba8cf04af548b59aa8f9ea77cd877f0) > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=e9e79be6cdcf4e44b260da7e6da4f5421f02d36b --- modules/video_chroma/d3d11_fmt.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/modules/video_chroma/d3d11_fmt.c b/modules/video_chroma/d3d11_fmt.c index 343ea17fb2..f43407a075 100644 --- a/modules/video_chroma/d3d11_fmt.c +++ b/modules/video_chroma/d3d11_fmt.c @@ -674,7 +674,13 @@ int D3D11_Create(vlc_object_t *obj, d3d11_handle_t *hd3d, bool with_shaders) return VLC_EGENERIC; } } +#endif + return VLC_SUCCESS; +} +void D3D11_Destroy(d3d11_handle_t *hd3d) +{ +#if !VLC_WINSTORE_APP # if !defined(NDEBUG) && defined(HAVE_DXGIDEBUG_H) if (IsDebuggerPresent()) { @@ -690,13 +696,6 @@ int D3D11_Create(vlc_object_t *obj, d3d11_handle_t *hd3d, bool with_shaders) } } # endif -#endif - return VLC_SUCCESS; -} - -void D3D11_Destroy(d3d11_handle_t *hd3d) -{ -#if !VLC_WINSTORE_APP if (hd3d->hdll) FreeLibrary(hd3d->hdll); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
