From: <tve...@ke...> - 2008-07-21 23:02:45
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: tvermeir Date: Mon Jul 21 2008 23:02:55 UTC Log message: * gst/gstcaps.c: Allow passing of NULL to gst_caps_union Modified files: . : ChangeLog gst : gstcaps.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.3973&r2=1.3974 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstcaps.c.diff?r1=1.187&r2=1.188 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.3973 retrieving revision 1.3974 diff -u -d -r1.3973 -r1.3974 --- ChangeLog 21 Jul 2008 21:32:04 -0000 1.3973 +++ ChangeLog 21 Jul 2008 23:02:37 -0000 1.3974 @@ -1,3 +1,8 @@ +2008-07-22 Thijs Vermeir <thi...@gm...> + + * gst/gstcaps.c: + Allow passing of NULL to gst_caps_union 2008-07-21 Thijs Vermeir <thi...@gm...> * gst/gstghostpad.c: Index: gstcaps.c RCS file: /cvs/gstreamer/gstreamer/gst/gstcaps.c,v retrieving revision 1.187 retrieving revision 1.188 diff -u -d -r1.187 -r1.188 --- gstcaps.c 17 Apr 2008 10:09:39 -0000 1.187 +++ gstcaps.c 21 Jul 2008 23:02:40 -0000 1.188 @@ -1406,6 +1406,8 @@ * Creates a new #GstCaps that contains all the formats that are in * either @caps1 and @caps2. * + * This function deals correctly with passing NULL for any of the caps. + * * Returns: the new #GstCaps */ GstCaps * @@ -1414,6 +1416,15 @@ GstCaps *dest1; GstCaps *dest2; + if (!caps1 && !caps2) + return gst_caps_new_empty (); + if (!caps1 || gst_caps_is_empty (caps1)) + return gst_caps_copy (caps2); + if (!caps2 || gst_caps_is_empty (caps2)) + return gst_caps_copy (caps1); if (gst_caps_is_any (caps1) || gst_caps_is_any (caps2)) return gst_caps_new_any (); |