ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinha...@outlook.com> | Mon May 6 11:43:06 2024 +0200| [ef16882e8f95e99ba44e7d27f01bbc8d4572ea92] | committer: Andreas Rheinhardt
avcodec/aac/aacdec: Move channel number check out of init_dsp() Also move initializing random_state. Reviewed-by: Lynne <d...@lynne.ee> Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ef16882e8f95e99ba44e7d27f01bbc8d4572ea92 --- libavcodec/aac/aacdec.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/aac/aacdec.c b/libavcodec/aac/aacdec.c index 64ac0ff88b..0d4daeeebd 100644 --- a/libavcodec/aac/aacdec.c +++ b/libavcodec/aac/aacdec.c @@ -1152,13 +1152,6 @@ static av_cold int init_dsp(AVCodecContext *avctx) const float *const scalep = is_fixed ? &scale_fixed : &scale_float; enum AVTXType tx_type = is_fixed ? AV_TX_INT32_MDCT : AV_TX_FLOAT_MDCT; - if (avctx->ch_layout.nb_channels > MAX_CHANNELS) { - av_log(avctx, AV_LOG_ERROR, "Too many channels\n"); - return AVERROR_INVALIDDATA; - } - - ac->random_state = 0x1f2e3d4c; - #define MDCT_INIT(s, fn, len, sval) \ scale_fixed = (sval) * 128.0f; \ scale_float = (sval) / 32768.0f; \ @@ -1241,6 +1234,13 @@ static av_cold int aac_decode_init_internal(AVCodecContext *avctx) } } + if (avctx->ch_layout.nb_channels > MAX_CHANNELS) { + av_log(avctx, AV_LOG_ERROR, "Too many channels\n"); + return AVERROR_INVALIDDATA; + } + + ac->random_state = 0x1f2e3d4c; + return init_dsp(avctx); } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
