gl: don't deadlock on context creation failure

https://bugzilla.gnome.org/show_bug.cgi?id=749284
This commit is contained in:
Matthew Waters 2015-05-13 23:54:52 +10:00
parent e6859acff2
commit d3d7498878

View file

@ -477,8 +477,10 @@ gst_gl_base_mixer_decide_allocation (GstGLBaseMixer * mix, GstQuery * query)
if (!mix->context) { if (!mix->context) {
mix->context = gst_gl_context_new (mix->display); mix->context = gst_gl_context_new (mix->display);
if (!gst_gl_context_create (mix->context, mix->priv->other_context, if (!gst_gl_context_create (mix->context, mix->priv->other_context,
&error)) &error)) {
GST_OBJECT_UNLOCK (mix->display);
goto context_error; goto context_error;
}
} }
} while (!gst_gl_display_add_context (mix->display, mix->context)); } while (!gst_gl_display_add_context (mix->display, mix->context));
GST_OBJECT_UNLOCK (mix->display); GST_OBJECT_UNLOCK (mix->display);