[vlc-commits] vout: simplify window locking

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Feb  2 12:17:30 2019 +0200| [6a411007ba98a1a7eb7eea0b7d4a8ed38dcd11b7] | committer: Rémi Denis-Courmont

vout: simplify window locking

Left over from 82bed6f09c3b357ff7390656637f39988138c11c.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6a411007ba98a1a7eb7eea0b7d4a8ed38dcd11b7
---

 src/video_output/video_output.c  | 4 +---
 src/video_output/vout_internal.h | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 7d370bf629..0ef179d059 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1605,10 +1605,8 @@ void vout_Close(vout_thread_t *vout)
 
     vout_chrono_Clean(&sys->render);
 
-    vlc_mutex_lock(&sys->window_lock);
+    vlc_mutex_destroy(&sys->window_lock);
     vout_display_window_Delete(sys->display_cfg.window);
-    sys->display_cfg.window = NULL;
-    vlc_mutex_unlock(&sys->window_lock);
 
     vlc_mutex_lock(&sys->spu_lock);
     spu_Destroy(sys->spu);
diff --git a/src/video_output/vout_internal.h b/src/video_output/vout_internal.h
index ee4ce67463..e51ed7acaf 100644
--- a/src/video_output/vout_internal.h
+++ b/src/video_output/vout_internal.h
@@ -166,6 +166,7 @@ struct vout_thread_sys_t
     vlc_mutex_t     window_lock;
 
     /* Video output display */
+    vlc_mutex_t     display_lock;
     vout_display_cfg_t display_cfg;
     vout_display_t *display;