This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 67217549c89a7227fe96b4409d5c8990c4238e97 Author: Andreas Rheinhardt <[email protected]> AuthorDate: Tue Feb 24 01:58:18 2026 +0100 Commit: Andreas Rheinhardt <[email protected]> CommitDate: Tue Mar 10 13:52:19 2026 +0100 avcodec/get_bits: Rename macro variables to avoid shadowing Especially 'n' often leads to shadowing, e.g. in mpeg12dec.c. Signed-off-by: Andreas Rheinhardt <[email protected]> --- libavcodec/get_bits.h | 68 +++++++++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 37 deletions(-) diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index a22c9755ae..940507f74a 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -572,71 +572,65 @@ static inline const uint8_t *align_get_bits(GetBitContext *s) */ #define GET_VLC(code, name, gb, table, bits, max_depth) \ do { \ - int n, nb_bits; \ - unsigned int index; \ + unsigned idx_ = SHOW_UBITS(name, gb, bits); \ + code = table[idx_].sym; \ + int n_ = table[idx_].len; \ \ - index = SHOW_UBITS(name, gb, bits); \ - code = table[index].sym; \ - n = table[index].len; \ - \ - if (max_depth > 1 && n < 0) { \ + if (max_depth > 1 && n_ < 0) { \ LAST_SKIP_BITS(name, gb, bits); \ UPDATE_CACHE(name, gb); \ \ - nb_bits = -n; \ + int nb__bits = -n_; \ \ - index = SHOW_UBITS(name, gb, nb_bits) + code; \ - code = table[index].sym; \ - n = table[index].len; \ - if (max_depth > 2 && n < 0) { \ - LAST_SKIP_BITS(name, gb, nb_bits); \ + idx_ = SHOW_UBITS(name, gb, nb__bits) + code; \ + code = table[idx_].sym; \ + n_ = table[idx_].len; \ + if (max_depth > 2 && n_ < 0) { \ + LAST_SKIP_BITS(name, gb, nb__bits); \ UPDATE_CACHE(name, gb); \ \ - nb_bits = -n; \ + nb__bits = -n_; \ \ - index = SHOW_UBITS(name, gb, nb_bits) + code; \ - code = table[index].sym; \ - n = table[index].len; \ + idx_ = SHOW_UBITS(name, gb, nb__bits) + code; \ + code = table[idx_].sym; \ + n_ = table[idx_].len; \ } \ } \ - SKIP_BITS(name, gb, n); \ + SKIP_BITS(name, gb, n_); \ } while (0) #define GET_RL_VLC(level, run, name, gb, table, bits, \ max_depth, need_update) \ do { \ - int n, nb_bits; \ - unsigned int index; \ - \ - index = SHOW_UBITS(name, gb, bits); \ - level = table[index].level; \ - n = table[index].len8; \ + unsigned idx_ = SHOW_UBITS(name, gb, bits); \ + level = table[idx_].level; \ + int n_ = table[idx_].len8; \ \ - if (max_depth > 1 && n < 0) { \ + if (max_depth > 1 && n_ < 0) { \ SKIP_BITS(name, gb, bits); \ if (need_update) { \ UPDATE_CACHE(name, gb); \ } \ \ - nb_bits = -n; \ + int nb__bits = -n_; \ \ - index = SHOW_UBITS(name, gb, nb_bits) + level; \ - level = table[index].level; \ - n = table[index].len8; \ - if (max_depth > 2 && n < 0) { \ - LAST_SKIP_BITS(name, gb, nb_bits); \ + idx_ = SHOW_UBITS(name, gb, nb__bits) + level; \ + level = table[idx_].level; \ + n_ = table[idx_].len8; \ + if (max_depth > 2 && n_ < 0) { \ + LAST_SKIP_BITS(name, gb, nb__bits); \ if (need_update) { \ UPDATE_CACHE(name, gb); \ } \ - nb_bits = -n; \ + nb__bits = -n_; \ \ - index = SHOW_UBITS(name, gb, nb_bits) + level; \ - level = table[index].level; \ - n = table[index].len8; \ + idx_ = SHOW_UBITS(name, gb, nb__bits) + level; \ + level = table[idx_].level; \ + n_ = table[idx_].len8; \ } \ } \ - run = table[index].run; \ - SKIP_BITS(name, gb, n); \ + run = table[idx_].run; \ + SKIP_BITS(name, gb, n_); \ } while (0) /** _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
