From 8dfd93c6fbaa2af1f0f996072f0db52bd83ee28d Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Wed, 28 May 2014 01:07:24 +0200
Subject: vo_vaapi: cleanup error handling on init

Close the X connection if initializing vaapi fails.
---
 video/out/vo_vaapi.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'video/out/vo_vaapi.c')

diff --git a/video/out/vo_vaapi.c b/video/out/vo_vaapi.c
index 470d767b60..8fb863ece6 100644
--- a/video/out/vo_vaapi.c
+++ b/video/out/vo_vaapi.c
@@ -571,16 +571,17 @@ static int preinit(struct vo *vo)
     VAStatus status;
 
     if (!vo_x11_init(vo))
-        return -1;
+        goto fail;
 
     p->display = vaGetDisplay(vo->x11->display);
     if (!p->display)
-        return -1;
+        goto fail;
 
     p->mpvaapi = va_initialize(p->display, p->log);
     if (!p->mpvaapi) {
         vaTerminate(p->display);
-        return -1;
+        p->display = NULL;
+        goto fail;
     }
 
     p->pool = mp_image_pool_new(MAX_OUTPUT_SURFACES + 3);
@@ -631,6 +632,10 @@ static int preinit(struct vo *vo)
             p->va_num_display_attrs = 0;
     }
     return 0;
+
+fail:
+    uninit(vo);
+    return -1;
 }
 
 #define OPT_BASE_STRUCT struct priv
-- 
cgit v1.2.3