From 2fe2bc55b96c4089bf4af272757190c1e122d6e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?= Date: Fri, 4 Nov 2016 16:26:18 +0100 Subject: vaapidecode: guard GST_VAAPI_MAKE_GLTEXUPLOAD_CAPS In commit 6d11a00 were introduced a regression when gstreamer-vaapi is compiled with out EGL/GLX support: it shall not support GST_VAAPI_MAKE_GLTEXUPLOAD_CAPS. This patch guards the inclusion of GST_VAAPI_MAKE_GLTEXUPLOAD_CAPS in the allowed src caps for vaapedecode if EGL/GLX. --- gst/vaapi/gstvaapidecode.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gst/vaapi/gstvaapidecode.c b/gst/vaapi/gstvaapidecode.c index a1f9b2fe..94e5eca2 100644 --- a/gst/vaapi/gstvaapidecode.c +++ b/gst/vaapi/gstvaapidecode.c @@ -212,8 +212,11 @@ gst_vaapidecode_ensure_allowed_srcpad_caps (GstVaapiDecode * decode) return FALSE; /* Create VA caps */ - out_caps = gst_caps_from_string (GST_VAAPI_MAKE_SURFACE_CAPS ";" - GST_VAAPI_MAKE_GLTEXUPLOAD_CAPS); + out_caps = gst_caps_from_string (GST_VAAPI_MAKE_SURFACE_CAPS +#if (USE_GLX || USE_EGL) + ";" GST_VAAPI_MAKE_GLTEXUPLOAD_CAPS +#endif + ); if (!out_caps) { GST_WARNING_OBJECT (decode, "failed to create VA/GL source caps"); return FALSE; -- cgit v1.2.1