vlc/vlc-3.0 | branch: master | Steve Lhomme <[email protected]> | Thu Aug 2 12:37:20 2018 +0200| [cc64d4c6311530a800e253dd8529b07db3d8c3a5] | committer: Steve Lhomme
direct3d11: protect the flush from concurrent access from the decoder thread(s) (cherry picked from commit 83d8394d9b24253e786bc21576155b7a586c1b16) > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=cc64d4c6311530a800e253dd8529b07db3d8c3a5 --- modules/video_output/win32/direct3d11.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c index 02046d150d..374abc5be7 100644 --- a/modules/video_output/win32/direct3d11.c +++ b/modules/video_output/win32/direct3d11.c @@ -1294,10 +1294,10 @@ static void Prepare(vout_display_t *vd, picture_t *picture, subpicture_t *subpic } } + ID3D11DeviceContext_Flush(sys->d3d_dev.d3dcontext); + if (is_d3d11_opaque(picture->format.i_chroma)) d3d11_device_unlock( &sys->d3d_dev ); - - ID3D11DeviceContext_Flush(sys->d3d_dev.d3dcontext); } static void Display(vout_display_t *vd, picture_t *picture, subpicture_t *subpicture) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
