glmixer: intersect with the filtercaps if available
authorMatthew Waters <ystreet00@gmail.com>
Thu, 26 Jun 2014 00:31:02 +0000 (10:31 +1000)
committerMatthew Waters <ystreet00@gmail.com>
Thu, 26 Jun 2014 00:31:41 +0000 (10:31 +1000)
gst-libs/gst/gl/gstglmixer.c

index 94ca44f..5f22506 100644 (file)
@@ -533,6 +533,10 @@ gst_gl_mixer_query_caps (GstPad * pad, GstAggregator * agg, GstQuery * query)
           "framerate", GST_TYPE_FRACTION_RANGE, 0, 1, G_MAXINT, 1, NULL);
     }
   }
+
+  if (filter)
+    caps = gst_caps_intersect_full (filter, caps, GST_CAPS_INTERSECT_FIRST);
+
   gst_query_set_caps_result (query, caps);
 
   return TRUE;