diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-04 10:17:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-04 10:17:52 +0200 |
| commit | 0104570fb65bef9986a630e0188b3756295693a9 (patch) | |
| tree | d0612ebe9b9cdf7fcf7da0c6ced55c0609887e05 /libavcodec/wmavoice.c | |
| parent | 711c8ee71d719d6d89a523618f078bb17dbe1abf (diff) | |
| parent | a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7 (diff) | |
Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7'
* commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7':
silly typo fixes
Conflicts:
doc/protocols.texi
libavcodec/aacpsy.c
libavformat/utils.c
tools/patcheck
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmavoice.c')
| -rw-r--r-- | libavcodec/wmavoice.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c index 19f8965a48..1bf2497667 100644 --- a/libavcodec/wmavoice.c +++ b/libavcodec/wmavoice.c @@ -605,7 +605,7 @@ static void calc_input_response(WMAVoiceContext *s, float *lpcs, /* 70.57 =~ 1/log10(1.0331663) */ idx = (pwr * gain_mul - 0.0295) * 70.570526123; - if (idx > 127) { // fallback if index falls outside table range + if (idx > 127) { // fall back if index falls outside table range coeffs[n] = wmavoice_energy_table[127] * powf(1.0331663, idx - 127); } else |