From b4a0a26dddd5275b70c1302904837a80cced6c6d Mon Sep 17 00:00:00 2001 From: Nicolas Dufresne Date: Tue, 13 May 2014 13:16:34 -0400 Subject: [PATCH] glfilter: Fix building without EGL support This fixes the OSX build and any builds with --disable-egl. That issue was introduced in "glfilter: rewrite transform_caps to preserve caps fields". https://bugzilla.gnome.org/show_bug.cgi?id=729861 --- gst-libs/gst/gl/gstglfilter.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gst-libs/gst/gl/gstglfilter.c b/gst-libs/gst/gl/gstglfilter.c index e567f03374..10d5a2c7f5 100644 --- a/gst-libs/gst/gl/gstglfilter.c +++ b/gst-libs/gst/gl/gstglfilter.c @@ -697,15 +697,19 @@ gst_gl_filter_transform_caps (GstBaseTransform * bt, if (direction == GST_PAD_SINK) { GstCaps *glcaps = gst_gl_filter_set_caps_features (caps, GST_CAPS_FEATURE_MEMORY_GL_MEMORY); +#if GST_GL_HAVE_PLATFORM_EGL GstCaps *eglcaps = gst_gl_filter_set_caps_features (caps, GST_CAPS_FEATURE_MEMORY_EGL_IMAGE); +#endif GstCaps *uploadcaps = gst_gl_filter_set_caps_features (caps, GST_CAPS_FEATURE_META_GST_VIDEO_GL_TEXTURE_UPLOAD_META); tmp = gst_caps_new_empty (); tmp = gst_caps_merge (tmp, glcaps); +#if GST_GL_HAVE_PLATFORM_EGL tmp = gst_caps_merge (tmp, eglcaps); +#endif tmp = gst_caps_merge (tmp, uploadcaps); tmp = gst_caps_merge (tmp, gst_caps_copy (caps)); } else {