wtay gstreamer: gstreamer/ gstreamer/libs/gst/base/

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     wtay
Date:           Sat Nov 22 2008  15:09:34 UTC

Log message:
* libs/gst/base/gstbasetransform.c:
(gst_base_transform_acceptcaps):
Rename a variable to make the code clearer.

Modified files:
    .               : ChangeLog
    libs/gst/base   : gstbasetransform.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.4172&r2=1.4173
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/libs/gst/base/gstbasetransform.c.diff?r1=1.130&r2=1.131

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.4172
retrieving revision 1.4173
diff -u -d -r1.4172 -r1.4173
--- ChangeLog	21 Nov 2008 20:57:13 -0000	1.4172
+++ ChangeLog	22 Nov 2008 15:09:17 -0000	1.4173
@@ -1,3 +1,9 @@
+2008-11-22  Wim Taymans  <[email protected]>
+
+	* libs/gst/base/gstbasetransform.c:
+	(gst_base_transform_acceptcaps):
+	Rename a variable to make the code clearer.
 2008-11-21  Stefan Kost  <[email protected]>
 
 	* plugins/elements/gstidentity.c:
Index: gstbasetransform.c
RCS file: /cvs/gstreamer/gstreamer/libs/gst/base/gstbasetransform.c,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- gstbasetransform.c	21 Nov 2008 17:14:48 -0000	1.130
+++ gstbasetransform.c	22 Nov 2008 15:09:20 -0000	1.131
@@ -982,20 +982,24 @@
   /* 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)

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/