From ae147979829685fc351ae89c95ed81efe2b689ba Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Thu, 5 Feb 2015 11:04:05 +1100 Subject: [PATCH] glcolorconvert: don't intersect with the input caps that limits our formats to whatever is in the input caps --- gst-libs/gst/gl/gstglcolorconvert.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gst-libs/gst/gl/gstglcolorconvert.c b/gst-libs/gst/gl/gstglcolorconvert.c index 755e587774..1cafd2eac0 100644 --- a/gst-libs/gst/gl/gstglcolorconvert.c +++ b/gst-libs/gst/gl/gstglcolorconvert.c @@ -635,20 +635,17 @@ GstCaps * gst_gl_color_convert_transform_caps (GstGLContext * convert, GstPadDirection direction, GstCaps * caps, GstCaps * filter) { - GstCaps *templ, *result, *tmp; + GstCaps *templ, *result; templ = gst_caps_from_string (GST_VIDEO_CAPS_MAKE_WITH_FEATURES (GST_CAPS_FEATURE_MEMORY_GL_MEMORY, GST_GL_COLOR_CONVERT_FORMATS)); - tmp = gst_caps_intersect_full (caps, templ, GST_CAPS_INTERSECT_FIRST); - gst_caps_unref (templ); - if (filter) { - result = gst_caps_intersect_full (filter, tmp, GST_CAPS_INTERSECT_FIRST); - gst_caps_unref (tmp); + result = gst_caps_intersect_full (filter, templ, GST_CAPS_INTERSECT_FIRST); + gst_caps_unref (templ); } else { - result = tmp; + result = templ; } return result;