From: <wt...@fr...> - 2006-01-20 09:58:56
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: wtay Date: Fri Jan 20 2006 01:56:51 PST Log message: * gst/gstpad.c: (gst_pad_link_check_compatible_unlocked): Make it actually compile too.. Modified files: . : ChangeLog gst : gstpad.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.2204&r2=1.2205 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstpad.c.diff?r1=1.488&r2=1.489 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.2204 retrieving revision 1.2205 diff -u -d -r1.2204 -r1.2205 --- ChangeLog 20 Jan 2006 09:53:24 -0000 1.2204 +++ ChangeLog 20 Jan 2006 09:56:38 -0000 1.2205 @@ -1,5 +1,10 @@ 2006-01-20 Wim Taymans <wi...@fl...> + * gst/gstpad.c: (gst_pad_link_check_compatible_unlocked): + Make it actually compile too.. + +2006-01-20 Wim Taymans <wi...@fl...> * gst/gstcaps.c: Clarify behaviour of _is_equal() when passing NULL parameters. Index: gstpad.c RCS file: /cvs/gstreamer/gstreamer/gst/gstpad.c,v retrieving revision 1.488 retrieving revision 1.489 diff -u -d -r1.488 -r1.489 --- gstpad.c 20 Jan 2006 09:53:24 -0000 1.488 +++ gstpad.c 20 Jan 2006 09:56:38 -0000 1.489 @@ -1507,6 +1507,7 @@ { GstCaps *srccaps; GstCaps *sinkcaps; + GstCaps *icaps; srccaps = gst_pad_get_caps_unlocked (src); sinkcaps = gst_pad_get_caps_unlocked (sink); @@ -1516,24 +1517,25 @@ /* if we have caps on both pads we can check the intersection. If one * of the caps is NULL, we return TRUE. */ - if (srccaps && sinkcaps) { - GstCaps *icaps; + if (srccaps == NULL || sinkcaps == NULL) + goto done; - icaps = gst_caps_intersect (srccaps, sinkcaps); - gst_caps_unref (srccaps); - gst_caps_unref (sinkcaps); + icaps = gst_caps_intersect (srccaps, sinkcaps); + gst_caps_unref (srccaps); + gst_caps_unref (sinkcaps); - if (icaps == NULL) - goto was_null; + if (icaps == NULL) + goto was_null; - GST_CAT_DEBUG (GST_CAT_CAPS, - "intersection caps %p %" GST_PTR_FORMAT, icaps, icaps); + GST_CAT_DEBUG (GST_CAT_CAPS, + "intersection caps %p %" GST_PTR_FORMAT, icaps, icaps); - if (gst_caps_is_empty (icaps)) - goto was_empty; + if (gst_caps_is_empty (icaps)) + goto was_empty; - gst_caps_unref (icaps); - } + gst_caps_unref (icaps); +done: return TRUE; /* incompatible cases */ |