diff --git a/ChangeLog b/ChangeLog index ff0952c9dc..72f4f387f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-10-05 Wim Taymans + + * gst/gstpad.c: (gst_pad_pause_task): + * gst/gstutils.c: + Small comment and documentation update. + 2007-10-05 Wim Taymans * libs/gst/base/gstbasesrc.c: (gst_base_src_wait_playing), diff --git a/gst/gstpad.c b/gst/gstpad.c index f06f4e95a2..5067cb9a89 100644 --- a/gst/gstpad.c +++ b/gst/gstpad.c @@ -4400,6 +4400,8 @@ gst_pad_pause_task (GstPad * pad) gst_task_pause (task); GST_OBJECT_UNLOCK (pad); + /* wait for task function to finish, this lock is recursive so it does nothing + * when the pause is called from the task itself */ GST_PAD_STREAM_LOCK (pad); GST_PAD_STREAM_UNLOCK (pad); diff --git a/gst/gstutils.c b/gst/gstutils.c index 2e1330642a..f745659d9e 100644 --- a/gst/gstutils.c +++ b/gst/gstutils.c @@ -2190,7 +2190,8 @@ gst_object_default_error (GstObject * source, GError * error, gchar * debug) * @...: additional elements to add to the bin * * Adds a NULL-terminated list of elements to a bin. This function is - * equivalent to calling gst_bin_add() for each member of the list. + * equivalent to calling gst_bin_add() for each member of the list. The return + * value of each gst_bin_add() is ignored. */ void gst_bin_add_many (GstBin * bin, GstElement * element_1, ...)