[vlc-commits] mediacodec: convert to Annex B when we got a nal size

Thomas Guillem git at videolan.org
Wed May 13 11:03:13 CEST 2015


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue May 12 17:13:40 2015 +0200| [d0506d71df1ab2d58617a30a931b19eb481b7ad7] | committer: Thomas Guillem

mediacodec: convert to Annex B when we got a nal size

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

 modules/codec/omxil/android_mediacodec.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/codec/omxil/android_mediacodec.c b/modules/codec/omxil/android_mediacodec.c
index 492defa..27d3443 100644
--- a/modules/codec/omxil/android_mediacodec.c
+++ b/modules/codec/omxil/android_mediacodec.c
@@ -1282,7 +1282,7 @@ static void H264ProcessBlock(decoder_t *p_dec, JNIEnv *env, block_t *p_block,
 
     assert(p_dec->fmt_in.i_codec == VLC_CODEC_H264 && p_block);
 
-    if (p_sys->p_csd0_buffer)
+    if (p_sys->nal_size)
     {
         convert_h264_to_annexb(p_block->p_buffer, p_block->i_buffer,
                                p_sys->nal_size, &convert_state);
@@ -1340,7 +1340,7 @@ static void HEVCProcessBlock(decoder_t *p_dec, JNIEnv *env, block_t *p_block,
 
     assert(p_dec->fmt_in.i_codec == VLC_CODEC_HEVC && p_block);
 
-    if (p_sys->p_csd0_buffer)
+    if (p_sys->nal_size)
     {
         convert_h264_to_annexb(p_block->p_buffer, p_block->i_buffer,
                                p_sys->nal_size, &convert_state);



More information about the vlc-commits mailing list