diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-26 11:11:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-26 11:12:11 +0200 |
| commit | 46ad2d9e446304e00f44760da5abd66f5117b4fa (patch) | |
| tree | f41cbe98d569fc5801aef45ec87ef5541c22515c /libavcodec/aac.h | |
| parent | 5dc2c99055ae4a95336f28c58c8c8da4033979f1 (diff) | |
| parent | 03039f4c8cdb4f8e5dc69905f3d73e2a531157e8 (diff) | |
| download | ffmpeg-46ad2d9e446304e00f44760da5abd66f5117b4fa.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
miscellaneous typo fixes
Conflicts:
configure
libavformat/avisynth.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aac.h')
| -rw-r--r-- | libavcodec/aac.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/aac.h b/libavcodec/aac.h index d586e271da..209c715e36 100644 --- a/libavcodec/aac.h +++ b/libavcodec/aac.h @@ -157,7 +157,7 @@ typedef struct LongTermPrediction { typedef struct IndividualChannelStream { uint8_t max_sfb; ///< number of scalefactor bands per group enum WindowSequence window_sequence[2]; - uint8_t use_kb_window[2]; ///< If set, use Kaiser-Bessel window, otherwise use a sinus window. + uint8_t use_kb_window[2]; ///< If set, use Kaiser-Bessel window, otherwise use a sine window. int num_window_groups; uint8_t group_len[8]; LongTermPrediction ltp; |