On 9/21/2019 8:29 AM, Jun Zhao wrote:
> From: Jun Zhao <barryjz...@tencent.com>
>
> add chan_config check to avoid indeterminate channels.
>
> Signed-off-by: Jun Zhao <barryjz...@tencent.com>
> ---
> libavcodec/mpeg4audio.c | 4 ++++
> 1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/libavcodec/mpeg4audio.c b/libavcodec/mpeg4audio.c
> index 2197147..0ada239 100644
> --- a/libavcodec/mpeg4audio.c
> +++ b/libavcodec/mpeg4audio.c
> @@ -93,6 +93,10 @@ int ff_mpeg4audio_get_config_gb(MPEG4AudioConfig *c,
> GetBitContext *gb,
> c->chan_config = get_bits(gb, 4);
> if (c->chan_config < FF_ARRAY_ELEMS(ff_mpeg4audio_channels))
> c->channels = ff_mpeg4audio_channels[c->chan_config];
> + else {
> + av_log(NULL, AV_LOG_ERROR, "Invalid chan_config %d\n",
> c->chan_config);
> + return -1;
> + }
> c->sbr = -1;
> c->ps = -1;
> if (c->object_type == AOT_SBR || (c->object_type == AOT_PS &&
Amended with a log context and applied, thanks.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
