diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 17:02:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 17:02:16 +0200 |
| commit | 36c5bb6a721a73b941a05500b32022d50e830207 (patch) | |
| tree | 6c6aedc88b24c79de58184dc6381513055125bc8 | |
| parent | 74409bff4ce90868b878f642873bf75a6c0ecee7 (diff) | |
| parent | b0b92ee04d1ee49a5d8b1aca718ea7d7d44932aa (diff) | |
| download | ffmpeg-36c5bb6a721a73b941a05500b32022d50e830207.tar.gz | |
Merge commit 'b0b92ee04d1ee49a5d8b1aca718ea7d7d44932aa' into release/2.2
* commit 'b0b92ee04d1ee49a5d8b1aca718ea7d7d44932aa':
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 a1183bea3f..6643ce235a 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]; |