summaryrefslogtreecommitdiff
path: root/gst-libs
diff options
context:
space:
mode:
authorNicolas Dufresne <nicolas.dufresne@collabora.com>2017-12-02 15:25:38 -0500
committerNicolas Dufresne <nicolas.dufresne@collabora.com>2017-12-02 15:25:38 -0500
commit472b8a3736d54c07196a21384f442f57a6a62737 (patch)
tree9c55bbc8fc02c049e31982e01f67362f5c8ee90f /gst-libs
parent69934d075677d18e47c2b08e9ee9b452f4f8f506 (diff)
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.
Diffstat (limited to 'gst-libs')
-rw-r--r--gst-libs/gst/gl/gstgldisplay.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/gst-libs/gst/gl/gstgldisplay.c b/gst-libs/gst/gl/gstgldisplay.c
index e74b7d94a..459392abc 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;