[vlc-commits] [Git][videolan/vlc][master] demux: mp4: replace assert with warning log
Jean-Baptiste Kempf (@jbk)
gitlab at videolan.org
Tue Jun 30 06:16:37 UTC 2026
Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC
Commits:
25d408fb by Steve Lhomme at 2026-06-30T08:05:13+02: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
- - - - -
1 changed file:
- modules/demux/mp4/essetup.c
Changes:
=====================================
modules/demux/mp4/essetup.c
=====================================
@@ -1309,7 +1309,10 @@ int SetupAudioES( demux_t *p_demux, const mp4_track_t *p_track,
if ( !p_esds ) p_esds = MP4_BoxGet( p_sample, "wave/esds" );
if ( p_esds && BOXDATA(p_esds) && BOXDATA(p_esds)->es_descriptor.p_decConfigDescr )
{
- assert(i_sample_type == ATOM_mp4a);
+ if( i_sample_type != ATOM_mp4a )
+ {
+ msg_Warn( p_demux, "Unexpected ESDS for %4.4s", (char *)&i_sample_type );
+ }
SetupESDS( p_demux, p_track, BOXDATA(p_esds)->es_descriptor.p_decConfigDescr, p_fmt );
}
else switch( i_sample_type )
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/25d408fb73617d6dd59efcb02d4fa6cd944f2b5b
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/25d408fb73617d6dd59efcb02d4fa6cd944f2b5b
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
More information about the vlc-commits
mailing list