From 9f4a8ccdf41e267a1e3db9fa826ebff8a1ef756d Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Wed, 11 Sep 2013 14:32:17 -0300 Subject: [PATCH] videomixer: Do not check if caps are empty when they are NULL In the case the caps are actually NULL, we should just concider it the same way as empty caps in that case. --- gst/videomixer/videomixer2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gst/videomixer/videomixer2.c b/gst/videomixer/videomixer2.c index ce3ba0a042..c12f036813 100644 --- a/gst/videomixer/videomixer2.c +++ b/gst/videomixer/videomixer2.c @@ -312,7 +312,7 @@ gst_videomixer2_update_converters (GstVideoMixer2 * mix) downstream_caps = gst_pad_get_allowed_caps (mix->srcpad); - if (gst_caps_is_empty (downstream_caps)) + if (!downstream_caps || gst_caps_is_empty (downstream_caps)) return FALSE; /* first find new preferred format */