diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 03:20:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 03:20:49 +0200 |
| commit | 97d7c8d5848899797ce657f50a1f7aa49c2955cd (patch) | |
| tree | 948bd0533f8c92ec1423ce2b34a325d54f4b1e14 | |
| parent | 8d3a967635c321df4c0cc9e99988719b3349429b (diff) | |
| parent | 7b66cf5ce7fdb8b3fa13459aab3f4d6ab559f1ea (diff) | |
| download | ffmpeg-97d7c8d5848899797ce657f50a1f7aa49c2955cd.tar.gz | |
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>
| -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 cee4bf2921..2be9d62dd6 100644 --- a/libavcodec/aacpsy.c +++ b/libavcodec/aacpsy.c @@ -313,7 +313,7 @@ static av_cold int psy_3gpp_init(FFPsyContext *ctx) { ctx->bitres.size = 6144 - pctx->frame_bits; ctx->bitres.size -= ctx->bitres.size % 8; 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++) { AacPsyCoeffs *coeffs = pctx->psy_coef[j]; const uint8_t *band_sizes = ctx->bands[j]; |