[vlc-commits] vmem: unlock before display

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Nov  3 18:10:15 2014 +0200| [57c046ce11210fb354da42e07ef99b724bf2d716] | committer: Rémi Denis-Courmont

vmem: unlock before display

The documentation promises that the picture is unlocked before it is
displayed, so actually do that.

(cherry picked from commit 0887539916acdb4276eed910cf88178084d9dba6)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=57c046ce11210fb354da42e07ef99b724bf2d716
---

 modules/video_output/vmem.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/video_output/vmem.c b/modules/video_output/vmem.c
index b4026ff..c5d2314 100644
--- a/modules/video_output/vmem.c
+++ b/modules/video_output/vmem.c
@@ -302,11 +302,13 @@ static picture_pool_t *Pool(vout_display_t *vd, unsigned count)
 static void Display(vout_display_t *vd, picture_t *picture, subpicture_t *subpicture)
 {
     vout_display_sys_t *sys = vd->sys;
+    void *id = picture->p_sys->id;
 
     assert(!picture_IsReferenced(picture));
-    if (sys->display != NULL)
-        sys->display(sys->opaque, picture->p_sys->id);
     picture_Release(picture);
+
+    if (sys->display != NULL)
+        sys->display(sys->opaque, id);
     VLC_UNUSED(subpicture);
 }