diff options
| author | Josep Torra <n770galaxy@gmail.com> | 2013-03-09 13:00:33 +0100 |
|---|---|---|
| committer | Josep Torra <n770galaxy@gmail.com> | 2013-03-09 13:18:31 +0100 |
| commit | 4012fdae64bfd7f5cdb96c72b69b5fc518b64e52 (patch) | |
| tree | 2f8d7b34482fe6bcc08063a4c6f9746d58cf0070 | |
| parent | 826ed9b80f01a639a6e315f05f37ae81ed9ee76e (diff) | |
| download | gst-omx-4012fdae64bfd7f5cdb96c72b69b5fc518b64e52.tar.gz | |
omxvideodec: avoid a deadlock
| -rw-r--r-- | omx/gstomxvideodec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c index 45dc902..8a4abba 100644 --- a/omx/gstomxvideodec.c +++ b/omx/gstomxvideodec.c @@ -1252,13 +1252,14 @@ gst_omx_video_dec_set_format (GstVideoDecoder * decoder, gst_omx_video_dec_drain (self, FALSE); gst_omx_port_set_flushing (self->dec_out_port, 5 * GST_SECOND, TRUE); + GST_VIDEO_DECODER_STREAM_UNLOCK (self); gst_pad_stop_task (GST_VIDEO_DECODER_SRC_PAD (decoder)); + GST_VIDEO_DECODER_STREAM_LOCK (self); if (klass->cdata.hacks & GST_OMX_HACK_NO_COMPONENT_RECONFIGURE) { GST_VIDEO_DECODER_STREAM_UNLOCK (self); gst_omx_video_dec_stop (GST_VIDEO_DECODER (self)); gst_omx_video_dec_close (GST_VIDEO_DECODER (self)); - GST_VIDEO_DECODER_STREAM_LOCK (self); if (!gst_omx_video_dec_open (GST_VIDEO_DECODER (self))) |