generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nellymoserenc: fix array element ordering

Browse Source 
Fixes assertion failures in trellis encoder
Fixes valgrind warnings in trellis encoder
Fixes CID732257
Fixes CID732256
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-10-12 04:19:38 +02:00
parent 927d866a99
commit 62722ae2d4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/nellymoserenc.c
View File

@ -62,8 +62,8 @@ typedef struct NellyMoserEncodeContext {
DECLARE_ALIGNED(32, float, mdct_out)[NELLY_SAMPLES]; DECLARE_ALIGNED(32, float, mdct_out)[NELLY_SAMPLES];
DECLARE_ALIGNED(32, float, in_buff)[NELLY_SAMPLES]; DECLARE_ALIGNED(32, float, in_buff)[NELLY_SAMPLES];
DECLARE_ALIGNED(32, float, buf)[3 * NELLY_BUF_LEN]; ///< sample buffer DECLARE_ALIGNED(32, float, buf)[3 * NELLY_BUF_LEN]; ///< sample buffer
float (*opt )[NELLY_BANDS]; float (*opt )[OPT_SIZE];
uint8_t (*path)[NELLY_BANDS]; uint8_t (*path)[OPT_SIZE];
} NellyMoserEncodeContext; } NellyMoserEncodeContext;
static float pow_table[POW_TABLE_SIZE]; ///< -pow(2, -i / 2048.0 - 3.0); static float pow_table[POW_TABLE_SIZE]; ///< -pow(2, -i / 2048.0 - 3.0);
@ -240,8 +240,8 @@ static void get_exponent_dynamic(NellyMoserEncodeContext *s, float *cand, int *i
int i, j, band, best_idx; int i, j, band, best_idx;
float power_candidate, best_val; float power_candidate, best_val;
float (*opt )[NELLY_BANDS] = s->opt ; float (*opt )[OPT_SIZE] = s->opt ;
uint8_t(*path)[NELLY_BANDS] = s->path; uint8_t(*path)[OPT_SIZE] = s->path;
for (i = 0; i < NELLY_BANDS * OPT_SIZE; i++) { for (i = 0; i < NELLY_BANDS * OPT_SIZE; i++) {
opt[0][i] = INFINITY; opt[0][i] = INFINITY;