diff options
| author | Vincent Penquerc'h <vincent.penquerch@collabora.co.uk> | 2015-02-24 16:06:08 +0000 |
|---|---|---|
| committer | Vincent Penquerc'h <vincent.penquerch@collabora.co.uk> | 2015-02-24 16:07:26 +0000 |
| commit | 561ddabd97b52229d65ac05a5e281f031e42e621 (patch) | |
| tree | 1aa3e578ff6f96b22f6250d2dbaf93ee8a04324c | |
| parent | 0b0c667e57675e6c61d25b268f5f4057c92b10bf (diff) | |
decodebin: fix deadlock when resetting buffering
This function is static, and only ever called with the expose lock
taken. It thus has no reason to take this lock itself.
This was introduced by one of my locking fixes from 741355.
https://bugzilla.gnome.org/show_bug.cgi?id=741355
| -rw-r--r-- | gst/playback/gstdecodebin2.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c index c4fa8572d..6e6b1becb 100644 --- a/gst/playback/gstdecodebin2.c +++ b/gst/playback/gstdecodebin2.c @@ -3062,13 +3062,11 @@ gst_decode_bin_reset_buffering (GstDecodeBin * dbin) return; GST_DEBUG_OBJECT (dbin, "Reseting multiqueues buffering"); - EXPOSE_LOCK (dbin); if (dbin->decode_chain) { CHAIN_MUTEX_LOCK (dbin->decode_chain); gst_decode_chain_reset_buffering (dbin->decode_chain); CHAIN_MUTEX_UNLOCK (dbin->decode_chain); } - EXPOSE_UNLOCK (dbin); } /**** |