]> git.sesse.net Git - vlc/commitdiff
vmem: unlock before display
authorRémi Denis-Courmont <remi@remlab.net>
Mon, 3 Nov 2014 16:10:15 +0000 (18:10 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Mon, 3 Nov 2014 16:13:07 +0000 (18:13 +0200)
The documentation promises that the picture is unlocked before it is
displayed, so actually do that.

modules/video_output/vmem.c

index 1d2783dc4c87d61e03409bd43c3c16ccaba09289..97055cba997e1864e38fd348843fc2ce4ece2e16 100644 (file)
@@ -303,11 +303,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;
 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));
 
     assert(!picture_IsReferenced(picture));
-    if (sys->display != NULL)
-        sys->display(sys->opaque, picture->p_sys->id);
     picture_Release(picture);
     picture_Release(picture);
+
+    if (sys->display != NULL)
+        sys->display(sys->opaque, id);
     VLC_UNUSED(subpicture);
 }
 
     VLC_UNUSED(subpicture);
 }