diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 17:32:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 17:32:52 +0100 |
| commit | d27edc038a5d59f25b28964b38d9f8d7ce4a6e64 (patch) | |
| tree | b43acbce10229c375ac3b21c80a6c2c09354da8d /libavcodec/aacpsy.c | |
| parent | a41bf09d9c56215448f14fb086c9f882eb41ecac (diff) | |
| parent | 511cf612ac979f536fd65e14603a87ca5ad435f3 (diff) | |
| download | ffmpeg-streaming-d27edc038a5d59f25b28964b38d9f8d7ce4a6e64.zip ffmpeg-streaming-d27edc038a5d59f25b28964b38d9f8d7ce4a6e64.tar.gz | |
Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'
* commit '511cf612ac979f536fd65e14603a87ca5ad435f3':
miscellaneous typo fixes
Conflicts:
libavcodec/4xm.c
libavcodec/lagarith.c
libavcodec/parser.c
libavcodec/ratecontrol.c
libavcodec/shorten.c
libavcodec/vda_h264.c
libavformat/dvenc.c
libavformat/wtv.c
tools/patcheck
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacpsy.c')
| -rw-r--r-- | libavcodec/aacpsy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c index fa562b3..d77b3de 100644 --- a/libavcodec/aacpsy.c +++ b/libavcodec/aacpsy.c @@ -597,7 +597,7 @@ static void psy_3gpp_analyze_channel(FFPsyContext *ctx, int channel, for (w = 0; w < wi->num_windows*16; w += 16) { AacPsyBand *bands = &pch->band[w]; - //5.4.2.3 "Spreading" & 5.4.3 "Spreaded Energy Calculation" + /* 5.4.2.3 "Spreading" & 5.4.3 "Spread Energy Calculation" */ spread_en[0] = bands[0].energy; for (g = 1; g < num_bands; g++) { bands[g].thr = FFMAX(bands[g].thr, bands[g-1].thr * coeffs[g].spread_hi[0]); @@ -617,7 +617,7 @@ static void psy_3gpp_analyze_channel(FFPsyContext *ctx, int channel, band->thr = FFMAX(PSY_3GPP_RPEMIN*band->thr, FFMIN(band->thr, PSY_3GPP_RPELEV*pch->prev_band[w+g].thr_quiet)); - /* 5.6.1.3.1 "Prepatory steps of the perceptual entropy calculation" */ + /* 5.6.1.3.1 "Preparatory steps of the perceptual entropy calculation" */ pe += calc_pe_3gpp(band); a += band->pe_const; active_lines += band->active_lines; |
