virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
Code Issues Releases Activity

avcodec/webp: Use uint8_t for code lengths

Browse Source 
They are always in the range 0..15, so using an int is not necessary.
Furthermore, using an int would not work if sizeof(int) != 4 as
ff_init_vlc_sparse() can only handle uint8_t, uint16_t and uint32_t
lengths.

Reviewed-by: zhilizhao(赵志立) <quinkblack@foxmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-10-22 15:54:08 +02:00
parent 6f36eb0da7
commit d4cce1514e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/webp.c
View File

@ -243,7 +243,7 @@ static int huff_reader_get_symbol(HuffReader *r, GetBitContext *gb)
return get_vlc2(gb, r->vlc.table, 8, 2);
}
static int huff_reader_build_canonical(HuffReader *r, int *code_lengths,
static int huff_reader_build_canonical(HuffReader *r, const uint8_t *code_lengths,
int alphabet_size)
{
int len = 0, sym, code = 0, ret;
@ -324,8 +324,8 @@ static int read_huffman_code_normal(WebPContext *s, HuffReader *hc,
int alphabet_size)
{
HuffReader code_len_hc = { { 0 }, 0, 0, { 0 } };
int *code_lengths = NULL;
int code_length_code_lengths[NUM_CODE_LENGTH_CODES] = { 0 };
uint8_t *code_lengths = NULL;
uint8_t code_length_code_lengths[NUM_CODE_LENGTH_CODES] = { 0 };
int i, symbol, max_symbol, prev_code_len, ret;
int num_codes = 4 + get_bits(&s->gb, 4);
@ -340,7 +340,7 @@ static int read_huffman_code_normal(WebPContext *s, HuffReader *hc,
if (ret < 0)
goto finish;
code_lengths = av_mallocz_array(alphabet_size, sizeof(*code_lengths));
code_lengths = av_mallocz(alphabet_size);
if (!code_lengths) {
ret = AVERROR(ENOMEM);
goto finish;