[vlc-commits] [Git][videolan/vlc][master] 2 commits: packetizer: mpeg4audio: fix non initialized profile

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
005fdbf5 by François Cartegnie at 2024-10-04T10:25:31+00:00
packetizer: mpeg4audio: fix non initialized profile

- - - - -
7c717a46 by François Cartegnie at 2024-10-04T10:25:31+00:00
codec: faad: also reject higher than ELD profiles

- - - - -


2 changed files:

- modules/codec/faad.c
- modules/packetizer/mpeg4audio.c


Changes:

=====================================
modules/codec/faad.c
=====================================
@@ -111,9 +111,9 @@ static int Open( vlc_object_t *p_this )
     NeAACDecConfiguration *cfg;
 
     if( p_dec->fmt_in->i_codec != VLC_CODEC_MP4A ||
-        p_dec->fmt_in->i_profile == AAC_PROFILE_ELD ||
+        p_dec->fmt_in->i_profile >= AAC_PROFILE_ELD ||
         (p_dec->fmt_in->i_extra > 1 &&
-         (GetWBE(p_dec->fmt_in->p_extra) & 0xffe0) == 0xf8e0)) /* ELD AOT */
+         (GetWBE(p_dec->fmt_in->p_extra) & 0xffe0) >= 0xf8e0)) /* ELD AOT */
     {
         return VLC_EGENERIC;
     }


=====================================
modules/packetizer/mpeg4audio.c
=====================================
@@ -249,6 +249,7 @@ static int OpenPacketizer(vlc_object_t *p_this)
     p_sys->i_state = STATE_NOSYNC;
     p_sys->b_discontuinity = false;
     block_BytestreamInit(&p_sys->bytestream);
+    p_sys->i_aac_profile = -1;
     p_sys->b_latm_cfg = false;
     p_sys->i_warnings = 0;
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/2123990073760a6faa34c92cef04d84703a8944a...7c717a464bae2afd70200f5f2f8fee70706f3646

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/2123990073760a6faa34c92cef04d84703a8944a...7c717a464bae2afd70200f5f2f8fee70706f3646
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance