diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-21 13:29:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-21 13:35:42 +0200 |
| commit | dcbff35199e1596d9d1200e734ef4a4c306e50f1 (patch) | |
| tree | e173e3208ed6a79a0648e4324c3cc398b7d176ca /libavcodec/acelp_pitch_delay.c | |
| parent | 05f228b0a01e8b97ba73a15c1eccb6b0a9060633 (diff) | |
| parent | d15c21e5fa3961f10026da1a3080a3aa3cf4cec9 (diff) | |
Merge commit 'd15c21e5fa3961f10026da1a3080a3aa3cf4cec9'
* commit 'd15c21e5fa3961f10026da1a3080a3aa3cf4cec9':
avutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI compatibility
avutil: make some tables visible again
avutil: remove inline av_log2 from public API
celp_math: rename ff_log2 to ff_log2_q15
Conflicts:
libavutil/libavutil.v
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/acelp_pitch_delay.c')
| -rw-r--r-- | libavcodec/acelp_pitch_delay.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/acelp_pitch_delay.c b/libavcodec/acelp_pitch_delay.c index e488cc8eff..95bcce7a4a 100644 --- a/libavcodec/acelp_pitch_delay.c +++ b/libavcodec/acelp_pitch_delay.c @@ -87,7 +87,7 @@ void ff_acelp_update_past_gain( if(erasure) quant_energy[0] = FFMAX(avg_gain >> log2_ma_pred_order, -10240) - 4096; // -10 and -4 in (5.10) else - quant_energy[0] = (6165 * ((ff_log2(gain_corr_factor) >> 2) - (13 << 13))) >> 13; + quant_energy[0] = (6165 * ((ff_log2_q15(gain_corr_factor) >> 2) - (13 << 13))) >> 13; } int16_t ff_acelp_decode_gain_code( |