[vlc-devel] [PATCH 3/7] video_output: asset the display existence inside the display_lock

Steve Lhomme robux4 at ycbcr.xyz
Wed Oct 9 17:36:45 CEST 2019


---
 src/video_output/video_output.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index df27a402b8b..e8ee9572188 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1346,8 +1346,6 @@ void vout_ChangePause(vout_thread_t *vout, bool is_paused, vlc_tick_t date)
 static void vout_FlushUnlocked(vout_thread_t *vout, bool below,
                                vlc_tick_t date)
 {
-    vout_thread_sys_t *sys = vout->p;
-
     vout->p->step.timestamp = VLC_TICK_INVALID;
     vout->p->step.last      = VLC_TICK_INVALID;
 
@@ -1368,8 +1366,8 @@ static void vout_FlushUnlocked(vout_thread_t *vout, bool below,
 
     picture_fifo_Flush(vout->p->decoder_fifo, date, below);
 
-    assert(sys->display != NULL);
     vlc_mutex_lock(&vout->p->display_lock);
+    assert(vout->p->display != NULL);
     vout_FilterFlush(vout->p->display);
     vlc_mutex_unlock(&vout->p->display_lock);
 
-- 
2.17.1



More information about the vlc-devel mailing list