diff options
author | Ramiro Polla <ramiro.polla@gmail.com> | 2009-04-21 22:53:46 +0000 |
---|---|---|
committer | Ramiro Polla <ramiro.polla@gmail.com> | 2009-04-21 22:53:46 +0000 |
commit | 420df9303775f40fd5e591c4da05527efce6752b (patch) | |
tree | 8d3177006246859c5e743f7ce2b5c5f30e22b599 /libavcodec/mlpdec.c | |
parent | 309616b2490d5504fe95fc0d71d2001a5ac27768 (diff) | |
download | ffmpeg-420df9303775f40fd5e591c4da05527efce6752b.tar.gz |
mlpdec: Don't overallocate buffers.
Now that max channels and primitive matrices are properly validated, there is
no need to be paranoid that random data will be overwritten.
As a bonus this makes matrix_coeff 16-byte aligned between matrices.
Originally committed as revision 18651 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mlpdec.c')
-rw-r--r-- | libavcodec/mlpdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 813be18b93..8f87cce351 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -93,7 +93,7 @@ typedef struct SubStream { //! Whether the LSBs of the matrix output are encoded in the bitstream. uint8_t lsb_bypass[MAX_MATRICES]; //! Matrix coefficients, stored as 2.14 fixed point. - int32_t matrix_coeff[MAX_MATRICES][MAX_CHANNELS+2]; + int32_t matrix_coeff[MAX_MATRICES][MAX_CHANNELS]; //! Left shift to apply to noise values in 0x31eb substreams. uint8_t matrix_noise_shift[MAX_MATRICES]; //@} @@ -143,7 +143,7 @@ typedef struct MLPDecodeContext { int8_t noise_buffer[MAX_BLOCKSIZE_POW2]; int8_t bypassed_lsbs[MAX_BLOCKSIZE][MAX_CHANNELS]; - int32_t sample_buffer[MAX_BLOCKSIZE][MAX_CHANNELS+2]; + int32_t sample_buffer[MAX_BLOCKSIZE][MAX_CHANNELS]; } MLPDecodeContext; static VLC huff_vlc[3]; |