mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-09-03 02:33:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

pad-monitor: only merge caps if they exist

Browse source 
Downtream can not be linked, so we shouldn't try to merge
NULL caps
This commit is contained in:
Thiago Santos 2013-07-23 11:51:07 -03:00
parent b58a7e533d
commit d8fa81eeff
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
validate/gst/qa/gst-qa-pad-monitor.c
View file

@ -186,6 +186,7 @@ gst_qa_pad_monitor_get_othercaps (GstQaPadMonitor * monitor)
GstIterator *iter; GstIterator *iter;
gboolean done; gboolean done;
GstPad *otherpad; GstPad *otherpad;
GstCaps *peercaps;
iter = gst_pad_iterate_internal_links (GST_QA_PAD_MONITOR_GET_PAD (monitor)); iter = gst_pad_iterate_internal_links (GST_QA_PAD_MONITOR_GET_PAD (monitor));
done = FALSE; done = FALSE;
@ -195,7 +196,9 @@ gst_qa_pad_monitor_get_othercaps (GstQaPadMonitor * monitor)
/* TODO What would be the correct caps operation to merge the caps in /* TODO What would be the correct caps operation to merge the caps in
* case one sink is internally linked to multiple srcs? */ * case one sink is internally linked to multiple srcs? */
gst_caps_merge (caps, gst_pad_peer_get_caps_reffed (otherpad)); peercaps = gst_pad_peer_get_caps_reffed (otherpad);
if (peercaps)
gst_caps_merge (caps, peercaps);
gst_object_unref (otherpad); gst_object_unref (otherpad);
break; break;