From 5109d9930c6588b2fa0e7bef756c4dc09f4e8cc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 2 Jul 2015 14:15:05 +0200 Subject: [PATCH] openh264dec: Uninitializing the decoder can't fail and will always return 0 == cmResultSuccess ... but when we cast cmResultSuccess to a gboolean it will be FALSE, and make GstVideoDecoder::stop() fail for no reason. --- ext/openh264/gstopenh264dec.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ext/openh264/gstopenh264dec.cpp b/ext/openh264/gstopenh264dec.cpp index e8fb3d2bbc..3e37d01ac6 100644 --- a/ext/openh264/gstopenh264dec.cpp +++ b/ext/openh264/gstopenh264dec.cpp @@ -207,10 +207,9 @@ static gboolean gst_openh264dec_stop (GstVideoDecoder * decoder) { GstOpenh264Dec *openh264dec = GST_OPENH264DEC (decoder); - gint ret = TRUE; if (openh264dec->priv->decoder) { - ret = openh264dec->priv->decoder->Uninitialize (); + openh264dec->priv->decoder->Uninitialize (); WelsDestroyDecoder (openh264dec->priv->decoder); openh264dec->priv->decoder = NULL; } @@ -221,7 +220,7 @@ gst_openh264dec_stop (GstVideoDecoder * decoder) } openh264dec->priv->width = openh264dec->priv->height = 0; - return ret; + return TRUE; } static gboolean