summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorAndreas Sinz <andreas.sinz@aon.at>2013-09-14 16:30:03 +0200
committerwm4 <wm4@nowhere>2013-09-16 13:45:47 +0200
commit44b66962795e3bbf58363c3e512480333d09d43c (patch)
tree6ef9d25afddbd2bd6d9a26c2df03b6d22299a537 /video
parent2f165ee12ba2ebd64cb11224563faa08ecb83e17 (diff)
downloadmpv-44b66962795e3bbf58363c3e512480333d09d43c.tar.bz2
mpv-44b66962795e3bbf58363c3e512480333d09d43c.tar.xz
gl_common: add wayland backend before x11 backend
Diffstat (limited to 'video')
-rw-r--r--video/out/gl_common.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/video/out/gl_common.c b/video/out/gl_common.c
index 48b1089147..3830f237f8 100644
--- a/video/out/gl_common.c
+++ b/video/out/gl_common.c
@@ -858,12 +858,14 @@ static struct backend backends[] = {
#ifdef CONFIG_GL_WIN32
{"win", mpgl_set_backend_w32},
#endif
-#ifdef CONFIG_GL_X11
- {"x11", mpgl_set_backend_x11},
-#endif
+
+//Add the wayland backend before x11, in order to probe for a wayland-server before a x11-server and avoid using xwayland
#ifdef CONFIG_GL_WAYLAND
{"wayland", mpgl_set_backend_wayland},
#endif
+#ifdef CONFIG_GL_X11
+ {"x11", mpgl_set_backend_x11},
+#endif
{0}
};