From f0c4e51d9d573ab5e52d231e613434cb5e1a8ffa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 26 Sep 2015 10:21:41 +0100 Subject: audiomixer: fix deadlock when G_DISABLE_ASSERT is not defined This makes the audiomixer unit test time out in master. Broke with 587e7c4 --- gst/audiomixer/gstaudioaggregator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gst/audiomixer/gstaudioaggregator.c b/gst/audiomixer/gstaudioaggregator.c index 156fa9362..2afea27d4 100644 --- a/gst/audiomixer/gstaudioaggregator.c +++ b/gst/audiomixer/gstaudioaggregator.c @@ -631,7 +631,7 @@ gst_audio_aggregator_set_sink_caps (GstAudioAggregator * aagg, GST_OBJECT_LOCK (pad); valid = gst_audio_info_from_caps (&pad->info, caps); g_assert (valid); - + GST_OBJECT_UNLOCK (pad); #else GST_OBJECT_LOCK (pad); (void) gst_audio_info_from_caps (&pad->info, caps); -- cgit v1.2.1