From 1eeecae29e6e3c05ab84786dc9ff6fd6a056b565 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Tue, 6 May 2014 17:08:18 +1000 Subject: [PATCH] gl/display: avoid opening the X11 display on systems with Cocoa (OS X) https://bugzilla.gnome.org/show_bug.cgi?id=729551 --- gst-libs/gst/gl/gstgldisplay.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gst-libs/gst/gl/gstgldisplay.c b/gst-libs/gst/gl/gstgldisplay.c index b6b46d51a6..5f5627dad8 100644 --- a/gst-libs/gst/gl/gstgldisplay.c +++ b/gst-libs/gst/gl/gstgldisplay.c @@ -133,6 +133,10 @@ gst_gl_display_new (void) platform_choice = g_getenv ("GST_GL_PLATFORM"); GST_INFO ("creating a window, user choice:%s", user_choice); +#if GST_GL_HAVE_WINDOW_COCOA + if (!display && (!user_choice || g_strstr_len (user_choice, 5, "cocoa"))) + display = GST_GL_DISPLAY (gst_gl_display_new ()); +#endif #if GST_GL_HAVE_WINDOW_X11 if (!display && (!user_choice || g_strstr_len (user_choice, 3, "x11"))) display = GST_GL_DISPLAY (gst_gl_display_x11_new (NULL));