diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-10-19 21:25:47 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-10-21 06:53:41 +0200 |
| commit | 289e9648734a3b8fd7241c9e3b4e9e5b3daf3200 (patch) | |
| tree | a82eb770c9a075d990e81a08b2b8d9c0857ab2db /libavcodec/vp3data.h | |
| parent | 786b1b0c44d3e5d71c3e69a3fe260baa95172e02 (diff) | |
| download | ffmpeg-289e9648734a3b8fd7241c9e3b4e9e5b3daf3200.tar.gz | |
avcodec/vp3: Unify initializing and freeing VLC tables
Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavcodec/vp3data.h')
| -rw-r--r-- | libavcodec/vp3data.h | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/libavcodec/vp3data.h b/libavcodec/vp3data.h index 3f24d5f7f6..a1366788c5 100644 --- a/libavcodec/vp3data.h +++ b/libavcodec/vp3data.h @@ -442,7 +442,7 @@ static const int16_t *const coeff_tables[32] = { coeff_table_token_31 }; -static const uint16_t dc_bias[16][32][2] = { +static const uint16_t vp3_bias[5 * 16][32][2] = { { /* DC bias table 0 */ { 0x2D, 6 }, { 0x26, 7 }, @@ -986,10 +986,7 @@ static const uint16_t dc_bias[16][32][2] = { { 0x151, 9 }, { 0x150, 9 }, { 0x2A9, 10 } - } -}; - -static const uint16_t ac_bias_0[16][32][2] = { + }, { /* AC bias group 1, table 0 */ { 0x8, 5 }, { 0x25, 7 }, @@ -1533,10 +1530,7 @@ static const uint16_t ac_bias_0[16][32][2] = { { 0x38, 7 }, { 0x3D, 6 }, { 0x79, 7 } - } -}; - -static const uint16_t ac_bias_1[16][32][2] = { + }, { /* AC bias group 2, table 0 */ { 0xB, 5 }, { 0x2B, 7 }, @@ -2080,10 +2074,7 @@ static const uint16_t ac_bias_1[16][32][2] = { { 0xB, 6 }, { 0x5F, 7 }, { 0xBD, 8 } - } -}; - -static const uint16_t ac_bias_2[16][32][2] = { + }, { /* AC bias group 3, table 0 */ { 0x3, 4 }, { 0x9, 6 }, @@ -2627,10 +2618,7 @@ static const uint16_t ac_bias_2[16][32][2] = { { 0x1B, 5 }, { 0x35B7, 14 }, { 0x35B6, 14 } - } -}; - -static const uint16_t ac_bias_3[16][32][2] = { + }, { /* AC bias group 4, table 0 */ { 0x0, 3 }, { 0x10, 5 }, |