From 6cea67b92aff4400083d9265c8953e603daceb40 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Thu, 26 Jun 2014 10:31:02 +1000 Subject: [PATCH] glmixer: intersect with the filtercaps if available --- gst-libs/gst/gl/gstglmixer.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gst-libs/gst/gl/gstglmixer.c b/gst-libs/gst/gl/gstglmixer.c index 94ca44f7d1..5f22506570 100644 --- a/gst-libs/gst/gl/gstglmixer.c +++ b/gst-libs/gst/gl/gstglmixer.c @@ -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;