har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/mpegaudiotab: Avoid unused entry in table

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-11-17 15:16:01 +01:00
parent 117575ae26
commit 12ace68ab0
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/mpegaudiodec_template.c
View File

@ -100,7 +100,7 @@ typedef struct MPADecodeContext {
/* vlc structure for decoding layer 3 huffman tables */ /* vlc structure for decoding layer 3 huffman tables */
static VLC huff_vlc[16]; static VLC huff_vlc[16];
static VLC_TYPE huff_vlc_tables[ static VLC_TYPE huff_vlc_tables[
0 + 128 + 128 + 128 + 130 + 128 + 154 + 166 + 128 + 128 + 128 + 130 + 128 + 154 + 166 +
142 + 204 + 190 + 170 + 542 + 460 + 662 + 414 142 + 204 + 190 + 170 + 542 + 460 + 662 + 414
][2]; ][2];
static VLC huff_quad_vlc[2]; static VLC huff_quad_vlc[2];
@ -286,7 +286,7 @@ static av_cold void decode_init_static(void)
/* huffman decode tables */ /* huffman decode tables */
offset = 0; offset = 0;
for (i = 1; i < 16; i++) { for (int i = 0; i < 15;) {
const HuffTable *h = &mpa_huff_tables[i]; const HuffTable *h = &mpa_huff_tables[i];
int xsize, x, y; int xsize, x, y;
uint8_t tmp_bits [512] = { 0 }; uint8_t tmp_bits [512] = { 0 };
@ -303,7 +303,7 @@ static av_cold void decode_init_static(void)
} }
/* XXX: fail test */ /* XXX: fail test */
huff_vlc[i].table = huff_vlc_tables+offset; huff_vlc[++i].table = huff_vlc_tables + offset;
huff_vlc[i].table_allocated = FF_ARRAY_ELEMS(huff_vlc_tables) - offset; huff_vlc[i].table_allocated = FF_ARRAY_ELEMS(huff_vlc_tables) - offset;
init_vlc(&huff_vlc[i], 7, 512, init_vlc(&huff_vlc[i], 7, 512,
tmp_bits, 1, 1, tmp_codes, 2, 2, tmp_bits, 1, 1, tmp_codes, 2, 2,

3
libavcodec/mpegaudiodectab.h
View File

@ -502,8 +502,7 @@ static const uint8_t mpa_huffbits_24[256] = {
7, 7, 7, 8, 8, 8, 8, 4, 7, 7, 7, 8, 8, 8, 8, 4,
}; };
static const HuffTable mpa_huff_tables[16] = { static const HuffTable mpa_huff_tables[] = {
{ 1, NULL, NULL },
{ 2, mpa_huffbits_1, mpa_huffcodes_1 }, { 2, mpa_huffbits_1, mpa_huffcodes_1 },
{ 3, mpa_huffbits_2, mpa_huffcodes_2 }, { 3, mpa_huffbits_2, mpa_huffcodes_2 },
{ 3, mpa_huffbits_3, mpa_huffcodes_3 }, { 3, mpa_huffbits_3, mpa_huffcodes_3 },