[vlc-commits] [Git][videolan/vlc][3.0.x] demux: mp4: replace assert with warning log

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC


Commits:
31954e94 by Steve Lhomme at 2026-07-21T08:48:33+00:00
demux: mp4: replace assert with warning log

The sample type is not actually used for SetupESDS().
It may actually be used for other atoms we don't know.

Fixes #28985

(adapted from commit 25d408fb73617d6dd59efcb02d4fa6cd944f2b5b)

- - - - -


1 changed file:

- modules/demux/mp4/essetup.c


Changes:

=====================================
modules/demux/mp4/essetup.c
=====================================
@@ -1250,6 +1250,10 @@ int SetupAudioES( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_t *p_sample )
     if ( p_esds && BOXDATA(p_esds) && BOXDATA(p_esds)->es_descriptor.p_decConfigDescr )
     {
         assert(p_sample->i_type == ATOM_mp4a);
+        if( p_sample->i_type != ATOM_mp4a )
+        {
+            msg_Warn( p_demux, "Unexpected ESDS for %4.4s", (char *)&p_sample->i_type );
+        }
         SetupESDS( p_demux, p_track, BOXDATA(p_esds)->es_descriptor.p_decConfigDescr );
     }
     else switch( p_sample->i_type )



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/31954e940d051f052bfcb0aee6639ccfcae624bc

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/31954e940d051f052bfcb0aee6639ccfcae624bc
You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help