mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-20 00:31:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

capsfilter: allow NULL filters and fix refcounting

Browse source
This commit is contained in:
Wim Taymans 2011-05-16 18:29:29 +02:00
parent 32f1899354
commit cf4c955615
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/elements/gstcapsfilter.c
View file

@ -258,8 +258,14 @@ gst_capsfilter_transform_caps (GstBaseTransform * base,
filter_caps = gst_caps_ref (capsfilter->filter_caps); filter_caps = gst_caps_ref (capsfilter->filter_caps);
GST_OBJECT_UNLOCK (capsfilter); GST_OBJECT_UNLOCK (capsfilter);
tmp = gst_caps_intersect_full (filter, filter_caps, GST_CAPS_INTERSECT_FIRST); if (filter) {
ret = gst_caps_intersect_full (tmp, caps, GST_CAPS_INTERSECT_FIRST); tmp =
gst_caps_intersect_full (filter, filter_caps, GST_CAPS_INTERSECT_FIRST);
gst_caps_unref (filter_caps);
filter_caps = tmp;
}
ret = gst_caps_intersect_full (filter_caps, caps, GST_CAPS_INTERSECT_FIRST);
GST_DEBUG_OBJECT (capsfilter, "input: %" GST_PTR_FORMAT, caps); GST_DEBUG_OBJECT (capsfilter, "input: %" GST_PTR_FORMAT, caps);
GST_DEBUG_OBJECT (capsfilter, "filter: %" GST_PTR_FORMAT, filter); GST_DEBUG_OBJECT (capsfilter, "filter: %" GST_PTR_FORMAT, filter);