diff options
author | Lou Logan <lou@lrcd.com> | 2012-03-12 14:30:13 -0800 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-13 01:14:04 +0100 |
commit | 2d38081b4f65f23077cb1b27f2d08c82c45afa05 (patch) | |
tree | 2657daa83ccd604d7fd71bf8d025995d302a86f7 /libavcodec | |
parent | 105cac3407e3064539939de58a1cfda8804e58c8 (diff) | |
download | ffmpeg-2d38081b4f65f23077cb1b27f2d08c82c45afa05.tar.gz |
cosmetics: fix some typos
Patch attached.
From 2d4094fc0dcb4ccd0735eb7e1719e228ebb56bb9 Mon Sep 17 00:00:00 2001
From: Lou Logan <lou@lrcd.com>
Date: Mon, 12 Mar 2012 14:13:44 -0800
Subject: [PATCH] cosmetics: fix some typos
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
-rw-r--r-- | libavcodec/eac3dec.c | 2 | ||||
-rw-r--r-- | libavcodec/g729dec.c | 2 | ||||
-rw-r--r-- | libavcodec/mpeg4videoenc.c | 4 | ||||
-rw-r--r-- | libavcodec/mpegvideo.h | 2 | ||||
-rw-r--r-- | libavcodec/vc1dec.c | 6 | ||||
-rw-r--r-- | libavcodec/vp8dsp.h | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index ccbcc33327..a3d5614fc3 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -80,7 +80,7 @@ * If you add a codec ID to this list, add it so that * 1. no value of a existing codec ID changes (that would break ABI), * 2. Give it a value which when taken as ASCII is recognized uniquely by a human as this specific codec. - * This ensures that 2 forks can independantly add CodecIDs without producing conflicts. + * This ensures that 2 forks can independently add CodecIDs without producing conflicts. */ enum CodecID { CODEC_ID_NONE, diff --git a/libavcodec/eac3dec.c b/libavcodec/eac3dec.c index 7fc1bb5071..91e35ad934 100644 --- a/libavcodec/eac3dec.c +++ b/libavcodec/eac3dec.c @@ -491,7 +491,7 @@ int ff_eac3_parse_header(AC3DecodeContext *s) s->skip_syntax = get_bits1(gbc); parse_spx_atten_data = get_bits1(gbc); - /* coupling strategy occurance and coupling use per block */ + /* coupling strategy occurrence and coupling use per block */ num_cpl_blocks = 0; if (s->channel_mode > 1) { for (blk = 0; blk < s->num_blocks; blk++) { diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c index b38945cd6c..5e55027b16 100644 --- a/libavcodec/g729dec.c +++ b/libavcodec/g729dec.c @@ -622,7 +622,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr, 1, 0, 0x800)) - /* Overflow occured, downscale excitation signal... */ + /* Overflow occurred, downscale excitation signal... */ for (j = 0; j < 2 * SUBFRAME_SIZE + PITCH_DELAY_MAX + INTERPOL_LEN; j++) ctx->exc_base[j] >>= 2; diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index e31d2ce363..b8d246de3d 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -89,7 +89,7 @@ static inline int get_block_rate(MpegEncContext * s, DCTELEM block[64], int bloc * @param[in,out] block MB coefficients, these will be restored * @param[in] dir ac prediction direction for each 8x8 block * @param[out] st scantable for each 8x8 block - * @param[in] zigzag_last_index index refering to the last non zero coefficient in zigzag order + * @param[in] zigzag_last_index index referring to the last non zero coefficient in zigzag order */ static inline void restore_ac_coeffs(MpegEncContext * s, DCTELEM block[6][64], const int dir[6], uint8_t *st[6], const int zigzag_last_index[6]) { @@ -120,7 +120,7 @@ static inline void restore_ac_coeffs(MpegEncContext * s, DCTELEM block[6][64], c * @param[in,out] block MB coefficients, these will be updated if 1 is returned * @param[in] dir ac prediction direction for each 8x8 block * @param[out] st scantable for each 8x8 block - * @param[out] zigzag_last_index index refering to the last non zero coefficient in zigzag order + * @param[out] zigzag_last_index index referring to the last non zero coefficient in zigzag order */ static inline int decide_ac_pred(MpegEncContext * s, DCTELEM block[6][64], const int dir[6], uint8_t *st[6], int zigzag_last_index[6]) { diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 14a298bc46..8cda2e9e2a 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -130,7 +130,7 @@ typedef struct Picture{ int ref_poc[2][2][32]; ///< h264 POCs of the frames/fields used as reference (FIXME need per slice) int ref_count[2][2]; ///< number of entries in ref_poc (FIXME need per slice) int mbaff; ///< h264 1 -> MBAFF frame 0-> not MBAFF - int field_picture; ///< whether or not the picture was encoded in seperate fields + int field_picture; ///< whether or not the picture was encoded in separate fields int sync; ///< has been decoded after a keyframe int mb_var_sum; ///< sum of MB variance for current frame diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index c51ea5d58a..95597aa075 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -3686,7 +3686,7 @@ static int vc1_decode_p_mb_intfr(VC1Context *v) int idx_mbmode = 0, mvbp; int stride_y, fieldtx; - mquant = v->pq; /* Loosy initialization */ + mquant = v->pq; /* Lossy initialization */ if (v->skip_is_raw) skipped = get_bits1(gb); @@ -3894,7 +3894,7 @@ static int vc1_decode_p_mb_intfi(VC1Context *v) int block_cbp = 0, pat, block_tt = 0; int idx_mbmode = 0; - mquant = v->pq; /* Loosy initialization */ + mquant = v->pq; /* Lossy initialization */ idx_mbmode = get_vlc2(gb, v->mbmode_vlc->table, VC1_IF_MBMODE_VLC_BITS, 2); if (idx_mbmode <= 1) { // intra MB @@ -4167,7 +4167,7 @@ static void vc1_decode_b_mb_intfi(VC1Context *v) int bmvtype = BMV_TYPE_BACKWARD; int idx_mbmode, interpmvp; - mquant = v->pq; /* Loosy initialization */ + mquant = v->pq; /* Lossy initialization */ s->mb_intra = 0; idx_mbmode = get_vlc2(gb, v->mbmode_vlc->table, VC1_IF_MBMODE_VLC_BITS, 2); diff --git a/libavcodec/vp8dsp.h b/libavcodec/vp8dsp.h index d0c7d4aacc..c4b9aa1a22 100644 --- a/libavcodec/vp8dsp.h +++ b/libavcodec/vp8dsp.h @@ -73,7 +73,7 @@ typedef struct VP8DSPContext { * second dimension: 0 if no vertical interpolation is needed; * 1 4-tap vertical interpolation filter (my & 1) * 2 6-tap vertical interpolation filter (!(my & 1)) - * third dimension: same as second dimention, for horizontal interpolation + * third dimension: same as second dimension, for horizontal interpolation * so something like put_vp8_epel_pixels_tab[width>>3][2*!!my-(my&1)][2*!!mx-(mx&1)](..., mx, my) */ vp8_mc_func put_vp8_epel_pixels_tab[3][3][3]; |