diff options
author | Wim Taymans <wim.taymans@gmail.com> | 2008-11-22 15:09:20 +0000 |
---|---|---|
committer | Wim Taymans <wim.taymans@gmail.com> | 2008-11-22 15:09:20 +0000 |
commit | 0cca473acf706385a266460ae56be643c501281f (patch) | |
tree | 9c04535dd9c61fa47c2ff470962f760da38c8f8f /libs | |
parent | 9e501b274fd0d2bedc235c4c82f4413727250f1b (diff) |
libs/gst/base/gstbasetransform.c: Rename a variable to make the code clearer.
Original commit message from CVS:
* libs/gst/base/gstbasetransform.c:
(gst_base_transform_acceptcaps):
Rename a variable to make the code clearer.
Diffstat (limited to 'libs')
-rw-r--r-- | libs/gst/base/gstbasetransform.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libs/gst/base/gstbasetransform.c b/libs/gst/base/gstbasetransform.c index 6daf70e394..140a3fe912 100644 --- a/libs/gst/base/gstbasetransform.c +++ b/libs/gst/base/gstbasetransform.c @@ -982,20 +982,24 @@ gst_base_transform_acceptcaps (GstPad * pad, GstCaps * caps) /* we need fixed caps for the check, fall back to the default implementation * if we don't */ if (!gst_caps_is_fixed (caps)) { - GstCaps *intersect; + GstCaps *allowed, *intersect; GST_DEBUG_OBJECT (pad, "non fixed accept caps %" GST_PTR_FORMAT, caps); - othercaps = gst_pad_get_caps (pad); - if (!othercaps) + /* get all the formats we can handle on this pad */ + allowed = gst_pad_get_caps (pad); + if (!allowed) goto no_transform_possible; - intersect = gst_caps_intersect (othercaps, caps); + /* intersect with the requested format */ + intersect = gst_caps_intersect (allowed, caps); GST_DEBUG_OBJECT (pad, "intersection %" GST_PTR_FORMAT, intersect); + /* we can accept if the intersection is not empty */ ret = !gst_caps_is_empty (intersect); gst_caps_unref (intersect); + gst_caps_unref (allowed); if (!ret) goto no_transform_possible; |