[vlc-commits] [Git][videolan/vlc][master] 2 commits: codec: omxil: ftbfs after dec fmt_in changes

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
f1d0e41e by François Cartegnie at 2026-04-03T09:51:53+00:00
codec: omxil: ftbfs after dec fmt_in changes

- - - - -
86e9db31 by François Cartegnie at 2026-04-03T09:51:53+00:00
codec: omxil: ftbfs after NAL helper changes

- - - - -


2 changed files:

- modules/codec/omxil/omxil.c
- modules/codec/omxil/omxil.h


Changes:

=====================================
modules/codec/omxil/omxil.c
=====================================
@@ -968,7 +968,7 @@ static int OpenGeneric( vlc_object_t *p_this, bool b_encode )
     OMX_FIFO_INIT (&p_sys->in.fifo, pOutputPortPrivate );
     p_sys->in.b_direct = false;
     p_sys->in.b_flushed = true;
-    p_sys->in.p_fmt = &p_dec->fmt_in;
+    p_sys->in.p_fmt = p_dec->fmt_in;
     OMX_FIFO_INIT (&p_sys->out.fifo, pInputPortPrivate );
     p_sys->out.b_direct = false;
     p_sys->out.b_flushed = true;
@@ -1040,8 +1040,9 @@ static int OpenGeneric( vlc_object_t *p_this, bool b_encode )
             h264_isavcC(p_dec->fmt_in->p_extra, p_dec->fmt_in->i_extra) )
         {
             size_t i_filled_len = 0;
+            uint8_t *p_buf;
             if( !h264_avcC_to_AnnexB_NAL( p_dec->fmt_in->p_extra, p_dec->fmt_in->i_extra,
-                                          &p_buf, &i_filled_len, NULL )
+                                          &p_buf, &i_filled_len, NULL ) )
             {
                 msg_Dbg(p_dec, "h264_avcC_to_AnnexB_NAL() failed");
                 goto error;
@@ -1062,9 +1063,10 @@ static int OpenGeneric( vlc_object_t *p_this, bool b_encode )
         else if( p_dec->fmt_in->i_codec == VLC_CODEC_HEVC && !p_sys->in.b_direct )
         {
             size_t i_filled_len;
+            uint8_t *p_buf;
             if( !hevc_hvcC_to_AnnexB_NAL( p_dec->fmt_in->p_extra, p_dec->fmt_in->i_extra,
                                          &p_buf, &i_filled_len,
-                                         &p_sys->i_nal_size_length )
+                                         &p_sys->i_nal_size_length ) )
             {
                 msg_Dbg(p_dec, "hevc_hvcC_to_AnnexB_NAL() failed");
                 goto error;


=====================================
modules/codec/omxil/omxil.h
=====================================
@@ -62,7 +62,7 @@ typedef struct OmxPort
     OMX_U32 i_port_index;
     OMX_HANDLETYPE omx_handle;
     OMX_PARAM_PORTDEFINITIONTYPE definition;
-    es_format_t *p_fmt;
+    const es_format_t *p_fmt;
 
     unsigned int i_frame_size;
     unsigned int i_frame_stride;



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/01f488820527ffb05dcae19f8ea66cd10c70c32b...86e9db31a824a1f7233d95bf32c274437684fe79

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/01f488820527ffb05dcae19f8ea66cd10c70c32b...86e9db31a824a1f7233d95bf32c274437684fe79
You're receiving this email because of your account on code.videolan.org.