diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-11 13:26:56 +0100 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-11-13 01:41:25 +0100 |
| commit | aa7c429c4e8e561009176d51b7dcb626c85eb276 (patch) | |
| tree | 5e731c9621016a12d672f5cceea9a65c0688120c /libavcodec | |
| parent | 8dd0a2c5cf40a8a49faae985adc11750b6429132 (diff) | |
| download | ffmpeg-aa7c429c4e8e561009176d51b7dcb626c85eb276.tar.gz | |
nellymoserenc: fix array element ordering
Fixes assertion failures and valgrind warnings in trellis encoder.
CC: libav-stable@libav.org
Bug-Id: CID 732256 / CID 732257
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/nellymoserenc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/nellymoserenc.c b/libavcodec/nellymoserenc.c index 9a84591456..302c69cade 100644 --- a/libavcodec/nellymoserenc.c +++ b/libavcodec/nellymoserenc.c @@ -62,8 +62,8 @@ typedef struct NellyMoserEncodeContext { DECLARE_ALIGNED(32, float, mdct_out)[NELLY_SAMPLES]; DECLARE_ALIGNED(32, float, in_buff)[NELLY_SAMPLES]; DECLARE_ALIGNED(32, float, buf)[3 * NELLY_BUF_LEN]; ///< sample buffer - float (*opt )[NELLY_BANDS]; - uint8_t (*path)[NELLY_BANDS]; + float (*opt )[OPT_SIZE]; + uint8_t (*path)[OPT_SIZE]; } NellyMoserEncodeContext; static float pow_table[POW_TABLE_SIZE]; ///< -pow(2, -i / 2048.0 - 3.0); @@ -228,8 +228,8 @@ static void get_exponent_dynamic(NellyMoserEncodeContext *s, float *cand, int *i int i, j, band, best_idx; float power_candidate, best_val; - float (*opt )[NELLY_BANDS] = s->opt ; - uint8_t(*path)[NELLY_BANDS] = s->path; + float (*opt )[OPT_SIZE] = s->opt ; + uint8_t(*path)[OPT_SIZE] = s->path; for (i = 0; i < NELLY_BANDS * OPT_SIZE; i++) { opt[0][i] = INFINITY; |