gst/gstcaps.c: Fix a bad bug with a simple fix. Because of unsigned ints, caps intersection was going nuts and trying...

Original commit message from CVS:
2005-10-16  Julien MOUTTE  <julien@moutte.net>

* 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.
This commit is contained in:
Julien Moutte 2005-10-16 09:56:33 +00:00
parent 26888eba87
commit c1e4762a6d
3 changed files with 11 additions and 2 deletions

View file

@ -1,3 +1,12 @@
2005-10-16 Julien MOUTTE <julien@moutte.net>
* 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 <thomas at apestaart dot org> 2005-10-16 Thomas Vander Stichele <thomas at apestaart dot org>
* configure.ac: * configure.ac:

View file

@ -955,7 +955,7 @@ gst_caps_structure_union (const GstStructure * struct1,
GstCaps * GstCaps *
gst_caps_intersect (const GstCaps * caps1, const GstCaps * caps2) gst_caps_intersect (const GstCaps * caps1, const GstCaps * caps2)
{ {
guint i, j, k; gint i, j, k;
GstStructure *struct1; GstStructure *struct1;
GstStructure *struct2; GstStructure *struct2;
GstCaps *dest; GstCaps *dest;

View file

@ -1480,7 +1480,7 @@ gst_pad_link_check_compatible_unlocked (GstPad * src, GstPad * sink)
srccaps = gst_pad_get_caps_unlocked (src); srccaps = gst_pad_get_caps_unlocked (src);
sinkcaps = gst_pad_get_caps_unlocked (sink); 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); GST_CAT_DEBUG (GST_CAT_CAPS, "sink caps %" GST_PTR_FORMAT, sinkcaps);
/* if we have caps on both pads we can check the intersection */ /* if we have caps on both pads we can check the intersection */