mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 09:40:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

autoconvert: Don't ignore elements accepted ANY, it is valid

Browse source
This commit is contained in:
Olivier Crête 2014-05-09 20:05:07 -04:00
parent f3f6cdd451
commit 4ccf7582a2
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gst/autoconvert/gstautoconvert.c
View file

@ -1102,16 +1102,14 @@ gst_auto_convert_getcaps (GstAutoConvert * autoconvert, GstCaps * filter,
element_caps = gst_pad_peer_query_caps (internal_pad, filter); element_caps = gst_pad_peer_query_caps (internal_pad, filter);
if (element_caps) { if (element_caps)
if (!gst_caps_is_any (element_caps) && caps = gst_caps_merge (caps, element_caps);
!gst_caps_is_empty (element_caps)) {
caps = gst_caps_merge (caps, element_caps);
} else {
gst_caps_unref (element_caps);
}
}
gst_object_unref (element); gst_object_unref (element);
/* Early out, any is absorbing */
if (gst_caps_is_any (caps))
goto out;
} else { } else {
const GList *tmp; const GList *tmp;
@ -1122,10 +1120,13 @@ gst_auto_convert_getcaps (GstAutoConvert * autoconvert, GstCaps * filter,
if (GST_PAD_TEMPLATE_DIRECTION (template) == dir) { if (GST_PAD_TEMPLATE_DIRECTION (template) == dir) {
GstCaps *static_caps = gst_static_pad_template_get_caps (template); GstCaps *static_caps = gst_static_pad_template_get_caps (template);
if (static_caps && !gst_caps_is_any (static_caps) && if (static_caps) {
!gst_caps_is_empty (static_caps)) {
caps = gst_caps_merge (caps, static_caps); caps = gst_caps_merge (caps, static_caps);
} }
/* Early out, any is absorbing */
if (gst_caps_is_any (caps))
goto out;
} }
} }
} }