Skip to content

F
ffmpeg.wasm-core
Commit 94d47382 authored by Alex Converse's avatar Alex Converse
Browse files
Options

aac: Don't attempt to output configure an invalid channel configuration.

parent 4d58e4cb
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
libavcodec/aacdec.c
View file @ 94d47382
...@@ -589,10 +589,11 @@ static av_cold int aac_decode_init(AVCodecContext *avctx) ...@@ -589,10 +589,11 @@ static av_cold int aac_decode_init(AVCodecContext *avctx)
ac->m4ac.chan_config = i; ac->m4ac.chan_config = i;
if (ac->m4ac.chan_config) { if (ac->m4ac.chan_config) {
if (set_default_channel_config(avctx, new_che_pos, ac->m4ac.chan_config) < 0 && int ret = set_default_channel_config(avctx, new_che_pos, ac->m4ac.chan_config);
avctx->error_recognition >= FF_ER_EXPLODE) if (!ret)
return AVERROR_INVALIDDATA;
output_configure(ac, ac->che_pos, new_che_pos, ac->m4ac.chan_config, OC_GLOBAL_HDR); output_configure(ac, ac->che_pos, new_che_pos, ac->m4ac.chan_config, OC_GLOBAL_HDR);
else if (avctx->error_recognition >= FF_ER_EXPLODE)
return AVERROR_INVALIDDATA;
} }
} }
......
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