vlc | branch: master | Steve Lhomme <[email protected]> | Thu Oct 10 12:59:46 2019 +0200| [c1f2fc714a0e144ed97e9534120e211e6d95d156] | committer: Steve Lhomme
video_output: remove unneeded test after the assert on sys->display was added > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c1f2fc714a0e144ed97e9534120e211e6d95d156 --- src/video_output/video_output.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index a504691386..faec343308 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -1700,15 +1700,13 @@ void vout_StopDisplay(vout_thread_t *vout) filter_DeleteBlend(sys->spu_blend); /* Destroy the rendering display */ - if (sys->display != NULL) { - if (sys->decoder_pool != NULL) - vout_FlushUnlocked(vout, true, INT64_MAX); + if (sys->decoder_pool != NULL) + vout_FlushUnlocked(vout, true, INT64_MAX); - vlc_mutex_lock(&sys->display_lock); - vout_CloseWrapper(vout, sys->display); - sys->display = NULL; - vlc_mutex_unlock(&sys->display_lock); - } + vlc_mutex_lock(&sys->display_lock); + vout_CloseWrapper(vout, sys->display); + sys->display = NULL; + vlc_mutex_unlock(&sys->display_lock); /* Destroy the video filters */ ThreadDelAllFilterCallbacks(vout); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
