vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Thu May 12 16:35:26 2016 +0200| [fce018fe1d32232b1065cd8c10427bfb1ccffdd2] | committer: Jean-Baptiste Kempf
D3D11: rework cleaning > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fce018fe1d32232b1065cd8c10427bfb1ccffdd2 --- modules/video_output/win32/direct3d11.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c index 91e8bcb..1772818 100644 --- a/modules/video_output/win32/direct3d11.c +++ b/modules/video_output/win32/direct3d11.c @@ -428,11 +428,9 @@ static int Open(vlc_object_t *object) msg_Dbg(vd, "Direct3D11 Open Succeeded"); return VLC_SUCCESS; + error: - Direct3D11Close(vd); - CommonClean(vd); - Direct3D11Destroy(vd); - free(vd->sys); + Close(vd); return VLC_EGENERIC; } @@ -852,8 +850,6 @@ static void Direct3D11Destroy(vout_display_t *vd) if (sys->hd3dcompiler_dll) FreeLibrary(sys->hd3dcompiler_dll); - /* TODO : add release of d3d11 objects here */ - sys->OurD3D11CreateDevice = NULL; sys->OurD3D11CreateDeviceAndSwapChain = NULL; sys->OurD3DCompile = NULL; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
