virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/mpc7, mpc7data: Make overlong arrays smaller

Browse Source 
For the VLC table arrays in mpc7_decode_init() this fixes
a regression introduced in 1e40dc920a.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-09-15 03:45:22 +02:00
parent 36c582f515
commit bec4e15859
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mpc7.c
View File

@ -97,10 +97,10 @@ static av_cold int mpc7_decode_init(AVCodecContext * avctx)
&mpc7_scfi[0], 2, 1, 1 << MPC7_SCFI_BITS); &mpc7_scfi[0], 2, 1, 1 << MPC7_SCFI_BITS);
INIT_VLC_STATIC(&dscf_vlc, MPC7_DSCF_BITS, MPC7_DSCF_SIZE, INIT_VLC_STATIC(&dscf_vlc, MPC7_DSCF_BITS, MPC7_DSCF_SIZE,
&mpc7_dscf[1], 2, 1, &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, INIT_VLC_STATIC(&hdr_vlc, MPC7_HDR_BITS, MPC7_HDR_SIZE,
&mpc7_hdr[1], 2, 1, &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(i = 0; i < MPC7_QUANT_VLC_TABLES; i++){
for(j = 0; j < 2; j++){ for(j = 0; j < 2; j++){
quant_vlc[i][j].table = &quant_tables[quant_offsets[i*2 + j]]; quant_vlc[i][j].table = &quant_tables[quant_offsets[i*2 + j]];

2
libavcodec/mpc7data.h
View File

@ -51,7 +51,7 @@ static const uint8_t mpc7_hdr[MPC7_HDR_SIZE * 2] = {
}; };
#define MPC7_QUANT_VLC_TABLES 7 #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 27, 25, 7, 9, 15, 31, 63
}; };