summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Penquerc'h <vincent.penquerch@collabora.co.uk>2012-06-27 11:12:27 +0000
committerVincent Penquerc'h <vincent.penquerch@collabora.co.uk>2012-06-27 11:12:27 +0000
commitc416488e9713d1343a0c8aec83806ed355815887 (patch)
treef42fdbf1338bc6687c42f639968eab56065a2586
parent151a889c83e77707365bab65b7b2cafda9b544d5 (diff)
ducatividdec: fix deadlocks on early out paths
-rw-r--r--src/gstducatividdec.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gstducatividdec.c b/src/gstducatividdec.c
index caeceb4..bebba5a 100644
--- a/src/gstducatividdec.c
+++ b/src/gstducatividdec.c
@@ -481,7 +481,7 @@ codec_process (GstDucatiVidDec * self, gboolean send, gboolean flush,
gboolean
gst_ducati_viddec_codec_flush (GstDucatiVidDec * self, gboolean eos)
{
- gint err;
+ gint err = FALSE;
GST_DEBUG_OBJECT (self, "flush: eos=%d", eos);
@@ -497,12 +497,12 @@ gst_ducati_viddec_codec_flush (GstDucatiVidDec * self, gboolean eos)
self->wait_keyframe = TRUE;
if (G_UNLIKELY (self->first_in_buffer)) {
- return TRUE;
+ goto out;
}
if (G_UNLIKELY (!self->codec)) {
GST_WARNING_OBJECT (self, "no codec");
- return TRUE;
+ goto out;
}
err = VIDDEC3_control (self->codec, XDM_FLUSH, self->dynParams, self->status);