projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 221c942)
basetransform: fix crash/warning in find_transform when pad is unlinked
authorRené Stadler <rene.stadler@collabora.co.uk>
Mon, 31 Oct 2011 18:23:41 +0000 (19:23 +0100)
committerRené Stadler <rene.stadler@collabora.co.uk>
Mon, 31 Oct 2011 18:27:07 +0000 (19:27 +0100)
Looks like the revert conflict in commit a44271 was resolved incorrectly.

libs/gst/base/gstbasetransform.c patch | blob | history

diff --git a/libs/gst/base/gstbasetransform.c b/libs/gst/base/gstbasetransform.c
index 5623236cc3492acb1b6b11e77b4008e45bef343f..183a70024dffce10b851a336fdc08c77af26d015 100644 (file)
--- a/libs/gst/base/gstbasetransform.c
+++ b/libs/gst/base/gstbasetransform.c
@@ -1065,7 +1065,7 @@ gst_base_transform_find_transform (GstBaseTransform * trans, GstPad * pad,
     goto could_not_fixate;
 
   /* and peer should accept */
-  if (!gst_pad_accept_caps (otherpeer, othercaps))
+  if (otherpeer && !gst_pad_accept_caps (otherpeer, othercaps))
     goto peer_no_accept;
 
   GST_DEBUG_OBJECT (trans, "Input caps were %" GST_PTR_FORMAT
Domain: Multimedia / Media Common;