diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2015-09-26 10:21:41 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2015-09-26 10:21:41 +0100 |
| commit | fccee018f309744f4f9ea35652cabd50231b4f5a (patch) | |
| tree | c5761f96120c1baa7b404cbb6932aceb7e81f07c /gst/audiomixer | |
| parent | 8169ee8372ad48fb69abd981586b8590964f3d17 (diff) | |
| download | gstreamer-plugins-bad-fccee018f309744f4f9ea35652cabd50231b4f5a.tar.gz | |
audiomixer: fix deadlock when G_DISABLE_ASSERT is not defined
This makes the audiomixer unit test time out in master.
Broke with 587e7c4
Diffstat (limited to 'gst/audiomixer')
| -rw-r--r-- | gst/audiomixer/gstaudioaggregator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gst/audiomixer/gstaudioaggregator.c b/gst/audiomixer/gstaudioaggregator.c index d774694e8..767a48d7c 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); |