mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 05:06:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

flacenc: remove bogus pad locking that causes deadlocks

Browse source 
It's not clear why the pad object lock is taken here. But
gst_pad_{has,get}_current_caps() will try to take the lock
as well and deadlock, since it's not recursive.
This commit is contained in:
Tim-Philipp Müller 2012-02-22 17:00:19 +00:00
parent 9c5c33790a
commit b7e96ebe37
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ext/flac/gstflacenc.c
View file

@ -612,8 +612,6 @@ gst_flac_enc_getcaps (GstAudioEncoder * enc, GstCaps * filter)
pad = GST_AUDIO_ENCODER_SINK_PAD (enc); pad = GST_AUDIO_ENCODER_SINK_PAD (enc);
GST_OBJECT_LOCK (pad);
if (gst_pad_has_current_caps (pad)) { if (gst_pad_has_current_caps (pad)) {
ret = gst_pad_get_current_caps (pad); ret = gst_pad_get_current_caps (pad);
} else { } else {
@ -662,8 +660,6 @@ gst_flac_enc_getcaps (GstAudioEncoder * enc, GstCaps * filter)
gst_structure_free (s); gst_structure_free (s);
} }
GST_OBJECT_UNLOCK (pad);
GST_DEBUG_OBJECT (pad, "Return caps %" GST_PTR_FORMAT, ret); GST_DEBUG_OBJECT (pad, "Return caps %" GST_PTR_FORMAT, ret);
caps = gst_audio_encoder_proxy_getcaps (enc, ret); caps = gst_audio_encoder_proxy_getcaps (enc, ret);