glcolorconvert: don't intersect with the input caps
authorMatthew Waters <matthew@centricular.com>
Thu, 5 Feb 2015 00:04:05 +0000 (11:04 +1100)
committerTim-Philipp Müller <tim@centricular.com>
Sat, 9 Dec 2017 19:31:54 +0000 (19:31 +0000)
that limits our formats to whatever is in the input caps

gst-libs/gst/gl/gstglcolorconvert.c

index 755e587..1cafd2e 100644 (file)
@@ -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;