Skip to content

V
vlc
Commit a9c4efde authored by Francois Cartegnie's avatar Francois Cartegnie
Browse files
Options

demux: mp4: fix off by one write in channels handling (cid #1251054)

parent a2aca1ef
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
modules/demux/mp4/essetup.c
View file @ a9c4efde
...@@ -730,9 +730,8 @@ int SetupAudioES( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_t *p_sample ) ...@@ -730,9 +730,8 @@ int SetupAudioES( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_t *p_sample )
{ {
if ( chan_bitmap_mapping[i].i_bitmap & i_bitmap ) if ( chan_bitmap_mapping[i].i_bitmap & i_bitmap )
{ {
i_channels++;
if ( (chan_bitmap_mapping[i].i_vlc & i_vlc_mapping) || if ( (chan_bitmap_mapping[i].i_vlc & i_vlc_mapping) ||
i_channels > AOUT_CHAN_MAX ) i_channels >= AOUT_CHAN_MAX )
{ {
/* double mapping or unsupported number of channels */ /* double mapping or unsupported number of channels */
i_vlc_mapping = 0; i_vlc_mapping = 0;
...@@ -740,8 +739,9 @@ int SetupAudioES( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_t *p_sample ) ...@@ -740,8 +739,9 @@ int SetupAudioES( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_t *p_sample )
break; break;
} }
i_vlc_mapping |= chan_bitmap_mapping[i].i_vlc; i_vlc_mapping |= chan_bitmap_mapping[i].i_vlc;
rgi_chans_sequence[i_channels - 1] = chan_bitmap_mapping[i].i_vlc; rgi_chans_sequence[i_channels] = chan_bitmap_mapping[i].i_vlc;
} }
i_channels++;
} }
rgi_chans_sequence[i_channels] = 0; rgi_chans_sequence[i_channels] = 0;
p_track->b_chans_reorder = !! p_track->b_chans_reorder = !!
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment