apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-11-02 05:23:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7'

Browse Source 
* commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7':
  silly typo fixes

Conflicts:
	doc/protocols.texi
	libavcodec/aacpsy.c
	libavformat/utils.c
	tools/patcheck

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-05-04 10:17:52 +02:00
parent 711c8ee71d a5f8873620
commit 0104570fb6
13 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/aacpsy.c
View File

@@ -603,7 +603,8 @@ static void psy_hp_filter(const float *firbuf, float *hpfsmpl, const float *psy_
sum1 += psy_fir_coeffs[j] * (firbuf[i + j] + firbuf[i + PSY_LAME_FIR_LEN - j]);
sum2 += psy_fir_coeffs[j + 1] * (firbuf[i + j + 1] + firbuf[i + PSY_LAME_FIR_LEN - j - 1]);
}
/* NOTE: The LAME psymodel expects it's input in the range -32768 to 32768. Tuning this for normalized floats would be difficult. */
/* NOTE: The LAME psymodel expects it's input in the range -32768 to 32768.
* Tuning this for normalized floats would be difficult. */
hpfsmpl[i] = (sum1 + sum2) * 32768.0f;
}
}