From 310e5111b70961e224b44b7aa7a87aaf0e925766 Mon Sep 17 00:00:00 2001 From: "Reynaldo H. Verdejo Pinochet" Date: Thu, 4 Oct 2012 02:15:24 -0300 Subject: [PATCH] eglglessink: Move display_region reset to locked section --- ext/eglgles/gsteglglessink.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ext/eglgles/gsteglglessink.c b/ext/eglgles/gsteglglessink.c index f7f8785..5717d59 100644 --- a/ext/eglgles/gsteglglessink.c +++ b/ext/eglgles/gsteglglessink.c @@ -2342,6 +2342,12 @@ gst_eglglessink_setcaps (GstBaseSink * bsink, GstCaps * caps) eglglessink->eglglesctx->display = NULL; + if (!gst_eglglessink_init_egl_display (eglglessink)) { + GST_ERROR_OBJECT (eglglessink, "Could not reinit display connection"); + goto HANDLE_ERROR; + } + + g_mutex_lock (eglglessink->flow_lock); /* Reset display region * XXX: Should probably keep old ones if set_render_rect() * has been called. @@ -2349,12 +2355,6 @@ gst_eglglessink_setcaps (GstBaseSink * bsink, GstCaps * caps) eglglessink->display_region.w = 0; eglglessink->display_region.h = 0; - if (!gst_eglglessink_init_egl_display (eglglessink)) { - GST_ERROR_OBJECT (eglglessink, "Could not reinit display connection"); - goto HANDLE_ERROR; - } - - g_mutex_lock (eglglessink->flow_lock); gst_caps_unref (eglglessink->current_caps); eglglessink->current_caps = NULL; g_mutex_unlock (eglglessink->flow_lock); -- 2.7.4