summaryrefslogtreecommitdiff
path: root/gst/vaapi
diff options
context:
space:
mode:
authorVíctor Manuel Jáquez Leal <vjaquez@igalia.com>2013-06-06 05:36:03 -0400
committerGwenole Beauchesne <gwenole.beauchesne@intel.com>2013-06-27 10:19:37 +0200
commit2fafbd7b64fc8f9deb14af58a0e40d2c5ebf7f22 (patch)
treea061d5252efb0cad4935538891beb77a1f5cee99 /gst/vaapi
parent8e0d65b3275617735e7f0ca5e9d1aa640611a385 (diff)
plugins: try to allocate a GLX display first over an X11 one.
If the gstreamer-vaapi plug-in elements are built with GLX support, then try to allocate a GstVaapiDisplayGLX first before resorting to a VA/X11 display next. https://bugzilla.gnome.org/show_bug.cgi?id=701742
Diffstat (limited to 'gst/vaapi')
-rw-r--r--gst/vaapi/gstvaapipluginutil.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/gst/vaapi/gstvaapipluginutil.c b/gst/vaapi/gstvaapipluginutil.c
index 855952ad..fe7b2b76 100644
--- a/gst/vaapi/gstvaapipluginutil.c
+++ b/gst/vaapi/gstvaapipluginutil.c
@@ -68,16 +68,16 @@ static const DisplayMap g_display_map[] = {
GST_VAAPI_DISPLAY_TYPE_WAYLAND,
gst_vaapi_display_wayland_new },
#endif
-#if USE_X11
- { "x11",
- GST_VAAPI_DISPLAY_TYPE_X11,
- gst_vaapi_display_x11_new },
-#endif
#if USE_GLX
{ "glx",
GST_VAAPI_DISPLAY_TYPE_GLX,
gst_vaapi_display_glx_new },
#endif
+#if USE_X11
+ { "x11",
+ GST_VAAPI_DISPLAY_TYPE_X11,
+ gst_vaapi_display_x11_new },
+#endif
#if USE_DRM
{ "drm",
GST_VAAPI_DISPLAY_TYPE_DRM,