summaryrefslogtreecommitdiff
path: root/sys/decklink
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2013-12-17 10:21:26 +0100
committerSebastian Dröge <sebastian@centricular.com>2013-12-17 10:21:26 +0100
commit007807d149611059a96d567cca758f4093b487aa (patch)
tree6db1b17d5ab44add8ed6177189df941f505d9403 /sys/decklink
parentccd9a9cb89919d1ce0b67095e52e3104d08274e4 (diff)
downloadgstreamer-plugins-bad-007807d149611059a96d567cca758f4093b487aa.tar.gz
decklinksink: Only intersect with the filter caps if there actually is a filter
Diffstat (limited to 'sys/decklink')
-rw-r--r--sys/decklink/gstdecklinksink.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/decklink/gstdecklinksink.cpp b/sys/decklink/gstdecklinksink.cpp
index b0c86eeca..afbd304c5 100644
--- a/sys/decklink/gstdecklinksink.cpp
+++ b/sys/decklink/gstdecklinksink.cpp
@@ -565,8 +565,12 @@ gst_decklink_sink_videosink_query (GstPad * pad, GstObject * parent,
* should probably return the template caps instead */
mode_caps = gst_decklink_mode_get_caps (decklinksink->mode);
gst_query_parse_caps (query, &filter);
- caps = gst_caps_intersect (mode_caps, filter);
- gst_caps_unref (mode_caps);
+ if (filter) {
+ caps = gst_caps_intersect (mode_caps, filter);
+ gst_caps_unref (mode_caps);
+ } else {
+ caps = mode_caps;
+ }
gst_query_set_caps_result (query, caps);
gst_caps_unref (caps);
res = TRUE;