summaryrefslogtreecommitdiff
path: root/gst-libs
diff options
context:
space:
mode:
authorMatthew Waters <ystreet00@gmail.com>2014-06-26 10:31:02 +1000
committerMatthew Waters <ystreet00@gmail.com>2014-06-26 10:31:41 +1000
commit596353854fc40b0a4204afe9074f3426832eb959 (patch)
treec281e27ab8d99fd71ebd38667c52f0e494978aa1 /gst-libs
parent8ef71b5db7ad997dbcebd13b8f8ea798cf68ce97 (diff)
downloadgstreamer-plugins-bad-596353854fc40b0a4204afe9074f3426832eb959.tar.gz
glmixer: intersect with the filtercaps if available
Diffstat (limited to 'gst-libs')
-rw-r--r--gst-libs/gst/gl/gstglmixer.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/gst-libs/gst/gl/gstglmixer.c b/gst-libs/gst/gl/gstglmixer.c
index 94ca44f7d..5f2250657 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;