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/mlp.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'libavcodec/mlp.h') diff --git a/libavcodec/mlp.h b/libavcodec/mlp.h index f4bb9246e3..c1c0abd7c2 100644 --- a/libavcodec/mlp.h +++ b/libavcodec/mlp.h @@ -29,15 +29,18 @@ /** Last possible matrix channel for each codec */ #define MAX_MATRIX_CHANNEL_MLP 5 #define MAX_MATRIX_CHANNEL_TRUEHD 7 -/** Maximum number of channels that can be decoded. */ -#define MAX_CHANNELS 16 +/** Maximum number of channels in a valid stream. + * MLP : 5.1 + 2 noise channels -> 8 channels + * TrueHD: 7.1 -> 8 channels + */ +#define MAX_CHANNELS 8 /** Maximum number of matrices used in decoding; most streams have one matrix * per output channel, but some rematrix a channel (usually 0) more than once. */ #define MAX_MATRICES_MLP 6 #define MAX_MATRICES_TRUEHD 8 -#define MAX_MATRICES 15 +#define MAX_MATRICES 8 /** Maximum number of substreams that can be decoded. * MLP's limit is 2. TrueHD supports at least up to 3. -- cgit v1.2.3