[vlc-commits] mediacodec: fix leak if ParseVideoExtra fails

Thomas Guillem git at videolan.org
Wed Jun 29 17:54:01 CEST 2016


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Jun 29 17:34:18 2016 +0200| [5d2777fff968abe709273b3687caa6bbdb8b25f3] | committer: Thomas Guillem

mediacodec: fix leak if ParseVideoExtra fails

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5d2777fff968abe709273b3687caa6bbdb8b25f3
---

 modules/codec/omxil/mediacodec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/codec/omxil/mediacodec.c b/modules/codec/omxil/mediacodec.c
index eaaf37f..92f938d 100644
--- a/modules/codec/omxil/mediacodec.c
+++ b/modules/codec/omxil/mediacodec.c
@@ -757,7 +757,7 @@ static int OpenDecoder(vlc_object_t *p_this, pf_MediaCodecApi_init pf_init)
         /* Try first to configure specific Video CSD */
         if (p_dec->fmt_in.i_cat == VIDEO_ES)
             if (ParseVideoExtra(p_dec) != VLC_SUCCESS)
-                return VLC_EGENERIC;
+                goto bailout;
 
         /* Set default CSD if ParseVideoExtra failed to configure one */
         if (!p_sys->pp_csd)



More information about the vlc-commits mailing list