From 4bba74f13f5ebc6507711bf586076ea099db51ac Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Fri, 14 Jul 2006 14:12:40 +0000 Subject: [PATCH] tests/check/pipelines/vorbisenc.c: Move a g_cond_signal to earlier to avoid sometimes deadlocking (commonly happens w... Original commit message from CVS: * tests/check/pipelines/vorbisenc.c: (stop_pipeline): Move a g_cond_signal to earlier to avoid sometimes deadlocking (commonly happens when running this test under valgrind) when trying to remove the buffer probe. --- ChangeLog | 7 +++++++ tests/check/pipelines/vorbisenc.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 09d520e888..c51e4d957c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-07-14 Michael Smith + + * tests/check/pipelines/vorbisenc.c: (stop_pipeline): + Move a g_cond_signal to earlier to avoid sometimes deadlocking + (commonly happens when running this test under valgrind) when trying + to remove the buffer probe. + 2006-07-13 Jan Schmidt * sys/xvimage/xvimagesink.c: (gst_xvimagesink_xvimage_new): diff --git a/tests/check/pipelines/vorbisenc.c b/tests/check/pipelines/vorbisenc.c index 57cdd929bc..395588d2ee 100644 --- a/tests/check/pipelines/vorbisenc.c +++ b/tests/check/pipelines/vorbisenc.c @@ -87,9 +87,9 @@ stop_pipeline (GstElement * bin, GstPad * pad) if (buf) gst_buffer_unref (buf); buf = NULL; + g_cond_signal (cond); gst_pad_remove_buffer_probe (pad, (guint) id); id = 0; - g_cond_signal (cond); g_mutex_unlock (lock); gst_element_set_state (bin, GST_STATE_NULL);