Browse Source

Merge commit '7b66cf5ce7fdb8b3fa13459aab3f4d6ab559f1ea' into release/2.4

* commit '7b66cf5ce7fdb8b3fa13459aab3f4d6ab559f1ea':
  aacpsy: correct calculation of minath in psy_3gpp_init

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.4.10
Michael Niedermayer 10 years ago
parent
commit
97d7c8d584
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      libavcodec/aacpsy.c

+ 1
- 1
libavcodec/aacpsy.c View File

@@ -313,7 +313,7 @@ static av_cold int psy_3gpp_init(FFPsyContext *ctx) {
ctx->bitres.size = 6144 - pctx->frame_bits; ctx->bitres.size = 6144 - pctx->frame_bits;
ctx->bitres.size -= ctx->bitres.size % 8; ctx->bitres.size -= ctx->bitres.size % 8;
pctx->fill_level = ctx->bitres.size; pctx->fill_level = ctx->bitres.size;
minath = ath(3410, ATH_ADD);
minath = ath(3410 - 0.733 * ATH_ADD, ATH_ADD);
for (j = 0; j < 2; j++) { for (j = 0; j < 2; j++) {
AacPsyCoeffs *coeffs = pctx->psy_coef[j]; AacPsyCoeffs *coeffs = pctx->psy_coef[j];
const uint8_t *band_sizes = ctx->bands[j]; const uint8_t *band_sizes = ctx->bands[j];


Loading…
Cancel
Save