highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavc/mpeg4audio: add chan_config check to avoid indeterminate channels

Browse Source 
add chan_config check to avoid indeterminate channels.

Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 333109f469)
This commit is contained in:
Jun Zhao
2019-09-21 19:29:47 +08:00
committed by James Almer
parent 3ecbb180ef
commit 4fbeaaa220
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mpeg4audio.c
View File

@ -93,6 +93,10 @@ int ff_mpeg4audio_get_config_gb(MPEG4AudioConfig *c, GetBitContext *gb,
c->chan_config = get_bits(gb, 4); c->chan_config = get_bits(gb, 4);
if (c->chan_config < FF_ARRAY_ELEMS(ff_mpeg4audio_channels)) if (c->chan_config < FF_ARRAY_ELEMS(ff_mpeg4audio_channels))
c->channels = ff_mpeg4audio_channels[c->chan_config]; c->channels = ff_mpeg4audio_channels[c->chan_config];
else {
av_log(NULL, AV_LOG_ERROR, "Invalid chan_config %d\n", c->chan_config);
return AVERROR_INVALIDDATA;
}
c->sbr = -1; c->sbr = -1;
c->ps = -1; c->ps = -1;
if (c->object_type == AOT_SBR || (c->object_type == AOT_PS && if (c->object_type == AOT_SBR || (c->object_type == AOT_PS &&