From 472b8a3736d54c07196a21384f442f57a6a62737 Mon Sep 17 00:00:00 2001 From: Nicolas Dufresne Date: Sat, 2 Dec 2017 15:25:38 -0500 Subject: [PATCH] gldisplay: Prefer wayland over X11 As most Wayland compositors supports XWayland, X11 backend get selected. This also realign better GStreamer decision to what happens with GTK and other stack out there. --- gst-libs/gst/gl/gstgldisplay.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gst-libs/gst/gl/gstgldisplay.c b/gst-libs/gst/gl/gstgldisplay.c index e74b7d94a7..459392abcd 100644 --- a/gst-libs/gst/gl/gstgldisplay.c +++ b/gst-libs/gst/gl/gstgldisplay.c @@ -292,14 +292,14 @@ gst_gl_display_new (void) return NULL; } #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)); -#endif #if GST_GL_HAVE_WINDOW_WAYLAND if (!display && (!user_choice || g_strstr_len (user_choice, 7, "wayland"))) display = GST_GL_DISPLAY (gst_gl_display_wayland_new (NULL)); #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)); +#endif #if GST_GL_HAVE_WINDOW_VIV_FB if (!display && (!user_choice || g_strstr_len (user_choice, 6, "viv-fb"))) { const gchar *disp_idx_str = NULL;