[vlc-commits] mediacodec: abort if ParseVideoExtraH264 fails

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu May 26 19:48:41 2016 +0200| [792c362ed827432d0eaa31b00f362eb6f2698ed0] | committer: Thomas Guillem

mediacodec: abort if ParseVideoExtraH264 fails

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

 modules/codec/omxil/mediacodec.c |   15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/modules/codec/omxil/mediacodec.c b/modules/codec/omxil/mediacodec.c
index 185a31f..1070b74 100644
--- a/modules/codec/omxil/mediacodec.c
+++ b/modules/codec/omxil/mediacodec.c
@@ -346,16 +346,15 @@ static int ParseVideoExtraH264(decoder_t *p_dec, uint8_t *p_extra, int i_extra)
         size_t i_size = 0;
         uint8_t *p_buf = h264_avcC_to_AnnexB_NAL(p_extra, i_extra, &i_size,
                                                  &p_sys->u.video.i_nal_length_size);
-        if (p_buf)
-        {
-            H264SetCSD(p_dec, p_buf, i_size, NULL);
-            free(p_buf);
-        }
+        if (!p_buf)
+            return VLC_EGENERIC;
+
+        int i_ret = H264SetCSD(p_dec, p_buf, i_size, NULL);
+        free(p_buf);
+        return i_ret;
     }
     else
-        H264SetCSD(p_dec, p_extra, i_extra, NULL);
-
-    return VLC_SUCCESS;
+        return H264SetCSD(p_dec, p_extra, i_extra, NULL);
 }
 
 static int ParseVideoExtraHEVC(decoder_t *p_dec, uint8_t *p_extra, int i_extra)