aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2013-05-04 21:18:13 +0200
committerDiego Biurrun <diego@biurrun.de>2013-07-25 19:43:32 +0200
commit03039f4c8cdb4f8e5dc69905f3d73e2a531157e8 (patch)
tree3ade6239dadc080b6d9c0d2dfb234fcf14ea48cc /libavcodec
parent93a51984a27f3ba84d4e6f13d0c704ee9891603e (diff)
downloadffmpeg-03039f4c8cdb4f8e5dc69905f3d73e2a531157e8.tar.gz
miscellaneous typo fixes
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/aac.h2
-rw-r--r--libavcodec/twinvq.c8
-rw-r--r--libavcodec/wma.c2
-rw-r--r--libavcodec/wmaprodec.c4
-rw-r--r--libavcodec/wmavoice.c2
5 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/aac.h b/libavcodec/aac.h
index b12d2bac33..a7c9995a31 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;
diff --git a/libavcodec/twinvq.c b/libavcodec/twinvq.c
index 887a88cf38..8c304c6afe 100644
--- a/libavcodec/twinvq.c
+++ b/libavcodec/twinvq.c
@@ -230,7 +230,7 @@ static void memset_float(float *buf, float val, int size)
* Evaluate a single LPC amplitude spectrum envelope coefficient from the line
* spectrum pairs.
*
- * @param lsp a vector of the cosinus of the LSP values
+ * @param lsp a vector of the cosine of the LSP values
* @param cos_val cos(PI*i/N) where i is the index of the LPC amplitude
* @param order the order of the LSP (and the size of the *lsp buffer). Must
* be a multiple of four.
@@ -302,9 +302,9 @@ static inline float get_cos(int idx, int part, const float *cos_tab, int size)
* unexplained condition.
*
* @param step the size of a block "siiiibiiii"
- * @param in the cosinus of the LSP data
- * @param part is 0 for 0...PI (positive cossinus values) and 1 for PI...2PI
- * (negative cossinus values)
+ * @param in the cosine of the LSP data
+ * @param part is 0 for 0...PI (positive cosine values) and 1 for PI...2PI
+ * (negative cosine values)
* @param size the size of the whole output
*/
static inline void eval_lpcenv_or_interp(TwinContext *tctx,
diff --git a/libavcodec/wma.c b/libavcodec/wma.c
index db276461a7..f5ea64a9ff 100644
--- a/libavcodec/wma.c
+++ b/libavcodec/wma.c
@@ -304,7 +304,7 @@ av_cold int ff_wma_init(AVCodecContext *avctx, int flags2)
}
#endif
- /* init MDCT windows : simple sinus window */
+ /* init MDCT windows : simple sine window */
for (i = 0; i < s->nb_block_sizes; i++) {
ff_init_ff_sine_windows(s->frame_len_bits - i);
s->windows[i] = ff_sine_windows[s->frame_len_bits - i];
diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c
index d3bd3816fa..bbf3216076 100644
--- a/libavcodec/wmaprodec.c
+++ b/libavcodec/wmaprodec.c
@@ -125,7 +125,7 @@ static VLC vec4_vlc; ///< 4 coefficients per symbol
static VLC vec2_vlc; ///< 2 coefficients per symbol
static VLC vec1_vlc; ///< 1 coefficient per symbol
static VLC coef_vlc[2]; ///< coefficient run length vlc codes
-static float sin64[33]; ///< sinus table for decorrelation
+static float sin64[33]; ///< sine table for decorrelation
/**
* @brief frame specific decoder context for a single channel
@@ -449,7 +449,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
1.0 / (1 << (WMAPRO_BLOCK_MIN_BITS + i - 1))
/ (1 << (s->bits_per_sample - 1)));
- /** init MDCT windows: simple sinus window */
+ /** init MDCT windows: simple sine window */
for (i = 0; i < WMAPRO_BLOCK_SIZES; i++) {
const int win_idx = WMAPRO_BLOCK_MAX_BITS - i;
ff_init_ff_sine_windows(win_idx);
diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c
index 219f4e5529..0ba2c48d32 100644
--- a/libavcodec/wmavoice.c
+++ b/libavcodec/wmavoice.c
@@ -620,7 +620,7 @@ static void calc_input_response(WMAVoiceContext *s, float *lpcs,
}
/* calculate the Hilbert transform of the gains, which we do (since this
- * is a sinus input) by doing a phase shift (in theory, H(sin())=cos()).
+ * is a sine input) by doing a phase shift (in theory, H(sin())=cos()).
* Hilbert_Transform(RDFT(x)) = Laplace_Transform(x), which calculates the
* "moment" of the LPCs in this filter. */
s->dct.dct_calc(&s->dct, lpcs);