gl/display: avoid opening the X11 display on systems with Cocoa (OS X)
authorMatthew Waters <ystreet00@gmail.com>
Tue, 6 May 2014 07:08:18 +0000 (17:08 +1000)
committerMatthew Waters <ystreet00@gmail.com>
Tue, 6 May 2014 11:08:30 +0000 (21:08 +1000)
https://bugzilla.gnome.org/show_bug.cgi?id=729551

gst-libs/gst/gl/gstgldisplay.c

index b6b46d51a6cc5bebd6a2d6484272dc8da8ed3a83..5f5627dad8d0d8aac3fa634762675ad6babd6130 100644 (file)
@@ -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));