mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-10 03:19:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

vaapidecode: guard GST_VAAPI_MAKE_GLTEXUPLOAD_CAPS

Browse source 
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.
This commit is contained in:
Víctor Manuel Jáquez Leal 2016-11-04 16:26:18 +01:00
parent ae8e5d44f7
commit d7231f66cc
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gst/vaapi/gstvaapidecode.c
View file

@ -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;