diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2023-10-22 22:14:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2023-11-01 16:40:22 +0100 |
| commit | a5259f326bcaf933a25df64aa49417c25990f7d3 (patch) | |
| tree | d6d51c72afe679e0e965ea7cc6126a326fc9f168 /libavcodec | |
| parent | 8516609edde98391017fb145b4f492c01b360a03 (diff) | |
| download | ffmpeg-a5259f326bcaf933a25df64aa49417c25990f7d3.tar.gz | |
avcodec/vlc: Pass VLC_MULTI_ELEM directly not by pointer
This makes the code more testable as uninitialized fields are 0
and not random values from the last call
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vlc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/vlc.c b/libavcodec/vlc.c index 07a4f019a2..78510e30d6 100644 --- a/libavcodec/vlc.c +++ b/libavcodec/vlc.c @@ -424,7 +424,7 @@ static void add_level(VLC_MULTI_ELEM *table, const int is16bit, uint32_t curcode, int curlen, int curlimit, int curlevel, const int minlen, const int max, - unsigned* levelcnt, VLC_MULTI_ELEM *info) + unsigned* levelcnt, VLC_MULTI_ELEM info) { int max_symbols = VLC_MULTI_MAX_SYMBOLS >> is16bit; for (int i = num-1; i >= max; i--) { @@ -440,16 +440,16 @@ static void add_level(VLC_MULTI_ELEM *table, const int is16bit, code = curcode + (buf[t].code >> curlen); newlimit = curlimit - l; l += curlen; - if (is16bit) AV_WN16(info->val+2*curlevel, sym); - else info->val[curlevel] = sym&0xFF; + if (is16bit) AV_WN16(info.val+2*curlevel, sym); + else info.val[curlevel] = sym&0xFF; if (curlevel) { // let's not add single entries uint32_t val = code >> (32 - numbits); uint32_t nb = val + (1U << (numbits - l)); - info->len = l; - info->num = curlevel+1; + info.len = l; + info.num = curlevel+1; for (; val < nb; val++) - AV_COPY64(table+val, info); + AV_COPY64(table+val, &info); levelcnt[curlevel-1]++; } @@ -503,7 +503,7 @@ static int vlc_multi_gen(VLC_MULTI_ELEM *table, const VLC *single, } add_level(table, is16bit, nb_codes, numbits, buf, - 0, 0, FFMIN(maxbits, numbits), 0, minbits, max, count, &info); + 0, 0, FFMIN(maxbits, numbits), 0, minbits, max, count, info); av_log(logctx, AV_LOG_DEBUG, "Joint: %d/%d/%d/%d/%d codes min=%ubits max=%u\n", count[0], count[1], count[2], count[3], count[4], minbits, max); |