flacenc: remove bogus pad locking that causes deadlocks
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:
parent
9c5c33790a
commit
b7e96ebe37
@ -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);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user