This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 0afa879a69005c3460f17a5641362ea50901d415 Author: Andreas Rheinhardt <[email protected]> AuthorDate: Tue Feb 24 02:47:32 2026 +0100 Commit: Andreas Rheinhardt <[email protected]> CommitDate: Tue Mar 10 13:52:19 2026 +0100 avcodec/aac/aacdec_usac: Fix shadowing Signed-off-by: Andreas Rheinhardt <[email protected]> --- libavcodec/aac/aacdec_usac.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/aac/aacdec_usac.c b/libavcodec/aac/aacdec_usac.c index bed9747e9c..bb2f83cfa6 100644 --- a/libavcodec/aac/aacdec_usac.c +++ b/libavcodec/aac/aacdec_usac.c @@ -1327,13 +1327,13 @@ static void spectrum_decode(AACDecContext *ac, AACUSACConfig *usac, /* Save coefficients and alpha values for prediction reasons */ if (nb_channels > 1) { - AACUsacStereo *us = &cpe->us; + AACUsacStereo *us2 = &cpe->us; for (int ch = 0; ch < nb_channels; ch++) { SingleChannelElement *sce = &cpe->ch[ch]; memcpy(sce->prev_coeffs, sce->coeffs, sizeof(sce->coeffs)); } - memcpy(us->prev_alpha_q_re, us->alpha_q_re, sizeof(us->alpha_q_re)); - memcpy(us->prev_alpha_q_im, us->alpha_q_im, sizeof(us->alpha_q_im)); + memcpy(us2->prev_alpha_q_re, us2->alpha_q_re, sizeof(us2->alpha_q_re)); + memcpy(us2->prev_alpha_q_im, us2->alpha_q_im, sizeof(us2->alpha_q_im)); } for (int ch = 0; ch < nb_channels; ch++) { @@ -1719,8 +1719,8 @@ static int parse_audio_preroll(AACDecContext *ac, GetBitContext *gb) } /* Byte alignment is not guaranteed. */ - for (int i = 0; i < au_len; i++) - tmp_buf[i] = get_bits(gb, 8); + for (int j = 0; j < au_len; j++) + tmp_buf[j] = get_bits(gb, 8); ret = init_get_bits8(&gbc, tmp_buf, au_len); if (ret < 0) _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
