[vlc-commits] codec: mediacodec: missing hvcC check before conversion

Francois Cartegnie git at videolan.org
Wed Dec 9 12:40:01 CET 2015


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Dec  9 11:52:56 2015 +0100| [809c2948efbf70cd897e6b8da8ffed16e7fee1bb] | committer: Francois Cartegnie

codec: mediacodec: missing hvcC check before conversion

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

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

diff --git a/modules/codec/omxil/mediacodec.c b/modules/codec/omxil/mediacodec.c
index 7df856e..238dcc6 100644
--- a/modules/codec/omxil/mediacodec.c
+++ b/modules/codec/omxil/mediacodec.c
@@ -320,7 +320,8 @@ static int ParseVideoExtra(decoder_t *p_dec, uint8_t *p_extra, int i_extra)
                 H264SetCSD(p_dec, p_buf, size, NULL);
         } else
         {
-            if (hevc_hvcC_to_AnnexB_NAL(p_dec, p_extra, i_extra,
+            if ( hevc_ishvcC(p_extra, i_extra) &&
+                    hevc_hvcC_to_AnnexB_NAL(p_dec, p_extra, i_extra,
                                        p_buf, buf_size, &size,
                                        &p_sys->u.video.i_nal_length_size) == VLC_SUCCESS)
             {



More information about the vlc-commits mailing list