diff --git a/ChangeLog b/ChangeLog index 7a52adb982..9bcfa87e70 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-04-22 Benjamin Otte + + * docs/gst/gstreamer-sections.txt: + add gst_caps_do_simplify + * gst/gstcaps.c: + add documentation for gst_caps_do_simplify + * gst/gstvalue.h: + fix typo in gst_value_register_subtract_func declaration for gst-doc + 2004-04-22 Benjamin Otte * gst/gstcaps.c: (gst_caps_from_string_inplace): diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt index 632b9679b3..017ff90c48 100644 --- a/docs/gst/gstreamer-sections.txt +++ b/docs/gst/gstreamer-sections.txt @@ -123,6 +123,7 @@ gst_caps_intersect gst_caps_union gst_caps_normalize gst_caps_simplify +gst_caps_do_simplify gst_caps_save_thyself gst_caps_load_thyself gst_caps_replace diff --git a/gst/gstcaps.c b/gst/gstcaps.c index a8f057f44b..53640dd179 100644 --- a/gst/gstcaps.c +++ b/gst/gstcaps.c @@ -1192,6 +1192,15 @@ gst_caps_structure_simplify (const GstStructure * simplify, return ret; } +/** + * gst_caps_simplify: + * @caps: a #GstCaps to simplify + * + * Modifies the given @caps inplace into a representation that represents the + * same set of formats, but in a simpler form. Component structures that are + * identical are merged. Component structures that have values that can be + * merged are also merged. + */ void gst_caps_do_simplify (GstCaps * caps) { diff --git a/gst/gstvalue.h b/gst/gstvalue.h index 9d67f9e1ee..4879cbeb2b 100644 --- a/gst/gstvalue.h +++ b/gst/gstvalue.h @@ -158,7 +158,7 @@ gboolean gst_value_subtract (GValue *dest, gboolean gst_value_can_subtract (const GValue *minuend, const GValue *subtrahend); void gst_value_register_subtract_func (GType minuend_type, - GType dubtrahend_type, + GType subtrahend_type, GstValueSubtractFunc func); /* fixation */