diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2023-10-22 20:04:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2023-10-27 18:10:46 +0200 |
| commit | 9b546a071764871dee20a690a31f97c8f33da769 (patch) | |
| tree | d581c29e324fe57d8ca3ae94256eb658ced6456e /libavcodec/vlc.c | |
| parent | a23d527ec5d550664fd595d22e6241c7b709fc96 (diff) | |
| download | ffmpeg-9b546a071764871dee20a690a31f97c8f33da769.tar.gz | |
avcodec/vlc: merge lost 16bit end of array check
Also cleanup related code
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/vlc.c')
| -rw-r--r-- | libavcodec/vlc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/vlc.c b/libavcodec/vlc.c index e4bbf2945e..4f62eddf0f 100644 --- a/libavcodec/vlc.c +++ b/libavcodec/vlc.c @@ -358,8 +358,8 @@ static void add_level(VLC_MULTI_ELEM *table, const int nb_elems, const int minlen, const int max, unsigned* levelcnt, VLC_MULTI_ELEM *info) { - if (nb_elems > 256 && curlevel > 2) - return; // No room + int is16bit = nb_elems>256; + int max_symbols = VLC_MULTI_MAX_SYMBOLS >> is16bit; for (int i = num-1; i > max; i--) { for (int j = 0; j < 2; j++) { int newlimit, sym; @@ -373,7 +373,7 @@ static void add_level(VLC_MULTI_ELEM *table, const int nb_elems, code = curcode + (buf[t].code >> curlen); newlimit = curlimit - l; l += curlen; - if (nb_elems>256) AV_WN16(info->val+2*curlevel, sym); + if (is16bit) AV_WN16(info->val+2*curlevel, sym); else info->val[curlevel] = sym&0xFF; if (curlevel) { // let's not add single entries @@ -386,7 +386,7 @@ static void add_level(VLC_MULTI_ELEM *table, const int nb_elems, levelcnt[curlevel-1]++; } - if (curlevel+1 < VLC_MULTI_MAX_SYMBOLS && newlimit >= minlen) { + if (curlevel+1 < max_symbols && newlimit >= minlen) { add_level(table, nb_elems, num, numbits, buf, code, l, newlimit, curlevel+1, minlen, max, levelcnt, info); |