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:26:12 +0100 |
| commit | f0c4e51d9d573ab5e52d231e613434cb5e1a8ffa (patch) | |
| tree | aacb9ede0052dfd4228d5167e2f84e3d93b0146a | |
| parent | 0237b02f96394f5f56cf84105eec812cee1bbd0c (diff) | |
| download | gstreamer-plugins-bad-f0c4e51d9d573ab5e52d231e613434cb5e1a8ffa.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
| -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 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); |