opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-03-13 09:00:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/get_bits: Rename macro variables to avoid shadowing

Browse Source 
Especially 'n' often leads to shadowing, e.g. in mpeg12dec.c.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2026-02-24 01:58:18 +01:00
parent 3343567482
commit 67217549c8
1 changed files with 31 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
libavcodec/get_bits.h
View File

@@ -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; \
unsigned idx_ = SHOW_UBITS(name, gb, bits); \
level = table[idx_].level; \
int n_ = table[idx_].len8; \
\
index = SHOW_UBITS(name, gb, bits); \
level = table[index].level; \
n = table[index].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)
/**