From 420df9303775f40fd5e591c4da05527efce6752b Mon Sep 17 00:00:00 2001 From: Ramiro Polla Date: Tue, 21 Apr 2009 22:53:46 +0000 Subject: 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 --- libavcodec/mlpdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavcodec/mlpdec.c') 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]; -- cgit v1.2.3