From 007807d149611059a96d567cca758f4093b487aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 17 Dec 2013 10:21:26 +0100 Subject: [PATCH] decklinksink: Only intersect with the filter caps if there actually is a filter --- sys/decklink/gstdecklinksink.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/decklink/gstdecklinksink.cpp b/sys/decklink/gstdecklinksink.cpp index b0c86eecaf..afbd304c57 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;