From d3d74988781b5d5510d2a04d148eec569ae8e300 Mon Sep 17 00:00:00 2001
From: Matthew Waters <matthew@centricular.com>
Date: Wed, 13 May 2015 23:54:52 +1000
Subject: [PATCH] gl: don't deadlock on context creation failure

https://bugzilla.gnome.org/show_bug.cgi?id=749284
---
 ext/gl/gstglbasemixer.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ext/gl/gstglbasemixer.c b/ext/gl/gstglbasemixer.c
index 0e670e044d..d462c161ad 100644
--- a/ext/gl/gstglbasemixer.c
+++ b/ext/gl/gstglbasemixer.c
@@ -477,8 +477,10 @@ gst_gl_base_mixer_decide_allocation (GstGLBaseMixer * mix, GstQuery * query)
       if (!mix->context) {
         mix->context = gst_gl_context_new (mix->display);
         if (!gst_gl_context_create (mix->context, mix->priv->other_context,
-                &error))
+                &error)) {
+          GST_OBJECT_UNLOCK (mix->display);
           goto context_error;
+        }
       }
     } while (!gst_gl_display_add_context (mix->display, mix->context));
     GST_OBJECT_UNLOCK (mix->display);