diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-09-15 03:45:22 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-09-15 22:13:24 +0200 |
| commit | bec4e158596bbb5af0eb2e9582cbc28961e6c068 (patch) | |
| tree | b94e8491cc0939b5f0970d24fd89ca1b61d5b730 /libavcodec | |
| parent | 36c582f515a7da4c5dda4890fcf588164f91255f (diff) | |
| download | ffmpeg-bec4e158596bbb5af0eb2e9582cbc28961e6c068.tar.gz | |
avcodec/mpc7, mpc7data: Make overlong arrays smaller
For the VLC table arrays in mpc7_decode_init() this fixes
a regression introduced in 1e40dc920a838e35f1483b20bfcd417437e68741.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpc7.c | 4 | ||||
| -rw-r--r-- | libavcodec/mpc7data.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mpc7.c b/libavcodec/mpc7.c index 8518bc2f8a..3c9ef6a600 100644 --- a/libavcodec/mpc7.c +++ b/libavcodec/mpc7.c @@ -97,10 +97,10 @@ static av_cold int mpc7_decode_init(AVCodecContext * avctx) &mpc7_scfi[0], 2, 1, 1 << MPC7_SCFI_BITS); INIT_VLC_STATIC(&dscf_vlc, MPC7_DSCF_BITS, MPC7_DSCF_SIZE, &mpc7_dscf[1], 2, 1, - &mpc7_dscf[0], 2, 1, 1 << MPC7_DSCF_SIZE); + &mpc7_dscf[0], 2, 1, 1 << MPC7_DSCF_BITS); INIT_VLC_STATIC(&hdr_vlc, MPC7_HDR_BITS, MPC7_HDR_SIZE, &mpc7_hdr[1], 2, 1, - &mpc7_hdr[0], 2, 1, 1 << MPC7_HDR_SIZE); + &mpc7_hdr[0], 2, 1, 1 << MPC7_HDR_BITS); for(i = 0; i < MPC7_QUANT_VLC_TABLES; i++){ for(j = 0; j < 2; j++){ quant_vlc[i][j].table = &quant_tables[quant_offsets[i*2 + j]]; diff --git a/libavcodec/mpc7data.h b/libavcodec/mpc7data.h index 5609e8fbf3..90ab75fe65 100644 --- a/libavcodec/mpc7data.h +++ b/libavcodec/mpc7data.h @@ -51,7 +51,7 @@ static const uint8_t mpc7_hdr[MPC7_HDR_SIZE * 2] = { }; #define MPC7_QUANT_VLC_TABLES 7 -static const uint8_t mpc7_quant_vlc_sizes[MPC7_QUANT_VLC_TABLES * 2] = { +static const uint8_t mpc7_quant_vlc_sizes[MPC7_QUANT_VLC_TABLES] = { 27, 25, 7, 9, 15, 31, 63 }; |