From 6627dd3ae3797eb551ed2ac9980d6a19b060ba7c Mon Sep 17 00:00:00 2001 From: Nicola Murino Date: Thu, 28 Sep 2017 13:12:58 +0200 Subject: [PATCH] videoencoder: remove the lock from gst_video_encoder_flush The lock is already taken before calling the flush method and can lead to deadlock for some encoders that need to take the same lock from another thread while flushing https://bugzilla.gnome.org/show_bug.cgi?id=787311 --- gst-libs/gst/video/gstvideoencoder.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/gst-libs/gst/video/gstvideoencoder.c b/gst-libs/gst/video/gstvideoencoder.c index 6016375110..03c76b9b37 100644 --- a/gst-libs/gst/video/gstvideoencoder.c +++ b/gst-libs/gst/video/gstvideoencoder.c @@ -418,11 +418,9 @@ gst_video_encoder_flush (GstVideoEncoder * encoder) GstVideoEncoderClass *klass = GST_VIDEO_ENCODER_GET_CLASS (encoder); gboolean ret = TRUE; - GST_VIDEO_ENCODER_STREAM_LOCK (encoder); if (klass->flush) ret = klass->flush (encoder); - GST_VIDEO_ENCODER_STREAM_UNLOCK (encoder); return ret; }