diff --git a/ChangeLog b/ChangeLog index e070b304ca..24f472082c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-10-16 Julien MOUTTE + + * gst/gstcaps.c: (gst_caps_intersect): Fix a bad bug with a simple + fix. Because of unsigned ints, caps intersection was going nuts and + trying to access structures with G_MAXUINT index. That fixes + videotestsrc ! ffmpegcolorspace ! fakesink + * gst/gstpad.c: (gst_pad_link_check_compatible_unlocked): logs + consistency. + 2005-10-16 Thomas Vander Stichele * configure.ac: diff --git a/gst/gstcaps.c b/gst/gstcaps.c index f0fc00bc25..59222e7922 100644 --- a/gst/gstcaps.c +++ b/gst/gstcaps.c @@ -955,7 +955,7 @@ gst_caps_structure_union (const GstStructure * struct1, GstCaps * gst_caps_intersect (const GstCaps * caps1, const GstCaps * caps2) { - guint i, j, k; + gint i, j, k; GstStructure *struct1; GstStructure *struct2; GstCaps *dest; diff --git a/gst/gstpad.c b/gst/gstpad.c index 202ded04af..2b55797564 100644 --- a/gst/gstpad.c +++ b/gst/gstpad.c @@ -1480,7 +1480,7 @@ gst_pad_link_check_compatible_unlocked (GstPad * src, GstPad * sink) srccaps = gst_pad_get_caps_unlocked (src); sinkcaps = gst_pad_get_caps_unlocked (sink); - GST_CAT_DEBUG (GST_CAT_CAPS, " src caps %" GST_PTR_FORMAT, srccaps); + GST_CAT_DEBUG (GST_CAT_CAPS, "src caps %" GST_PTR_FORMAT, srccaps); GST_CAT_DEBUG (GST_CAT_CAPS, "sink caps %" GST_PTR_FORMAT, sinkcaps); /* if we have caps on both pads we can check the intersection */