diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-18 17:58:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-18 17:58:58 +0100 |
| commit | 4eb41d16bee406d1481d412639230510015ea708 (patch) | |
| tree | c6fa80c3b060c6a71c43082802974163c911663b /libavcodec/aacpsy.c | |
| parent | 12bcfe05b45175cc7fc5cc719392c35ee5a3c39c (diff) | |
| parent | 350785a6621529c50771f4e7043b4d159a96ed26 (diff) | |
| download | ffmpeg-4eb41d16bee406d1481d412639230510015ea708.tar.gz | |
Merge remote-tracking branch 'newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacpsy.c')
| -rw-r--r-- | libavcodec/aacpsy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c index d9896ed74f..9938e3710a 100644 --- a/libavcodec/aacpsy.c +++ b/libavcodec/aacpsy.c @@ -397,7 +397,7 @@ static void psy_3gpp_analyze(FFPsyContext *ctx, int channel, int i, w, g; const int num_bands = ctx->num_bands[wi->num_windows == 8]; const uint8_t *band_sizes = ctx->bands[wi->num_windows == 8]; - AacPsyCoeffs *coeffs = &pctx->psy_coef[wi->num_windows == 8]; + AacPsyCoeffs *coeffs = pctx->psy_coef[wi->num_windows == 8]; //calculate energies, initial thresholds and related values - 5.4.2 "Threshold Calculation" for (w = 0; w < wi->num_windows*16; w += 16) { |