diff options
| author | Stefan Kost <ensonic@users.sourceforge.net> | 2005-11-27 22:43:08 +0000 |
|---|---|---|
| committer | Stefan Kost <ensonic@users.sourceforge.net> | 2005-11-27 22:43:08 +0000 |
| commit | 7b347681d536892c8286d31c6b6b18f02584561d (patch) | |
| tree | 47f1bea0d509bb2d660909e206bd2358772b2b43 /gst | |
| parent | 676421cf07c02ffb85d8a8d546863df297a4a1ae (diff) | |
gst/gstelement.c: don't loop forever
Original commit message from CVS:
* gst/gstelement.c: (gst_element_dispose):
don't loop forever
* gst/gstiterator.c:
* gst/gststructure.c:
doc fixes
* libs/gst/controller/gstcontroller.c:
(gst_controlled_property_set_interpolation_mode):
* libs/gst/controller/gstcontroller.h:
* libs/gst/controller/gstinterpolation.c:
(interpolate_none_get_enum_value_array):
support controlling enums
Diffstat (limited to 'gst')
| -rw-r--r-- | gst/gstelement.c | 4 | ||||
| -rw-r--r-- | gst/gstiterator.c | 4 | ||||
| -rw-r--r-- | gst/gststructure.c | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/gst/gstelement.c b/gst/gstelement.c index 19e5f2fad..e4196d47a 100644 --- a/gst/gstelement.c +++ b/gst/gstelement.c @@ -2403,8 +2403,10 @@ gst_element_dispose (GObject * object) } g_return_if_fail (GST_STATE_PENDING (element) == GST_STATE_VOID_PENDING); + GST_DEBUG ("removing %d pads", g_list_length (element->pads)); /* first we break all our links with the outside */ - while (element->pads) { + while (element->pads && element->pads->data) { + /* don't call _remove_pad with NULL */ gst_element_remove_pad (element, GST_PAD_CAST (element->pads->data)); } if (G_UNLIKELY (element->pads != 0)) { diff --git a/gst/gstiterator.c b/gst/gstiterator.c index c8659abab..72acafffa 100644 --- a/gst/gstiterator.c +++ b/gst/gstiterator.c @@ -48,6 +48,10 @@ * ...rollback changes to items... * gst_iterator_resync (it); * break; + * case GST_ITERATOR_ERROR: + * ...wrong parameter were given... + * done = TRUE; + * break; * case GST_ITERATOR_DONE: * done = TRUE; * break; diff --git a/gst/gststructure.c b/gst/gststructure.c index 9485e3817..51d79f40d 100644 --- a/gst/gststructure.c +++ b/gst/gststructure.c @@ -1341,7 +1341,7 @@ gst_structure_value_get_generic_type (GValue * val) * * Converts @structure to a human-readable string representation. * - * Returns: a pointer to string allocated by g_malloc(). g_free after + * Returns: a pointer to string allocated by g_malloc(). g_free() after * usage. */ gchar * |