diff options
| author | Matthew Waters <ystreet00@gmail.com> | 2014-05-06 17:08:18 +1000 |
|---|---|---|
| committer | Matthew Waters <ystreet00@gmail.com> | 2014-05-06 21:08:30 +1000 |
| commit | 1eeecae29e6e3c05ab84786dc9ff6fd6a056b565 (patch) | |
| tree | 8f1ca27b841c506270778d0390731d378f76967b /gst-libs | |
| parent | 8743301af9ef89b7886898fbcb64310452a4af47 (diff) | |
| download | gstreamer-plugins-bad-1eeecae29e6e3c05ab84786dc9ff6fd6a056b565.tar.gz | |
gl/display: avoid opening the X11 display on systems with Cocoa (OS X)
https://bugzilla.gnome.org/show_bug.cgi?id=729551
Diffstat (limited to 'gst-libs')
| -rw-r--r-- | gst-libs/gst/gl/gstgldisplay.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gst-libs/gst/gl/gstgldisplay.c b/gst-libs/gst/gl/gstgldisplay.c index b6b46d51a..5f5627dad 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)); |