[vlc-commits] vdpau/display: fix subpicture leak on error

Rémi Denis-Courmont git at videolan.org
Tue Nov 22 18:37:57 CET 2016


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Nov 22 19:37:27 2016 +0200| [bb08b9c452baf0f1878a04dc9fc312191a06c828] | committer: Rémi Denis-Courmont

vdpau/display: fix subpicture leak on error

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

 modules/hw/vdpau/display.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/hw/vdpau/display.c b/modules/hw/vdpau/display.c
index b1d17a8..f87a38e 100644
--- a/modules/hw/vdpau/display.c
+++ b/modules/hw/vdpau/display.c
@@ -309,13 +309,13 @@ static void Wait(vout_display_t *vd, picture_t *pic, subpicture_t *subpicture)
             msg_Err(vd, "presentation queue blocking error: %s",
                     vdp_get_error_string(sys->vdp, err));
             picture_Release(pic);
-            return;
+            goto out;
         }
         picture_Release(current);
     }
 
     sys->current = pic;
-
+out:
     /* We already dealt with the subpicture in the Queue phase, so it's safe to
        delete at this point */
     if (subpicture)



More information about the vlc-commits mailing list