diff options
author | Diego Biurrun <diego@biurrun.de> | 2012-06-13 13:41:12 +0400 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2012-07-03 19:35:11 +0400 |
commit | 09f211987cddf279390f8abe24d6a7a69622e356 (patch) | |
tree | 6f76ac0f8daf9794935c11bd99b7025daa13b178 /libavcodec | |
parent | 22662ca56086ddb7240dc84a68ad89c785682f36 (diff) |
misc typo and wording fixes
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/anm.c | 4 | ||||
-rw-r--r-- | libavcodec/dsputil.h | 4 | ||||
-rw-r--r-- | libavcodec/h264.c | 4 | ||||
-rw-r--r-- | libavcodec/version.h | 2 | ||||
-rw-r--r-- | libavcodec/xvmc.h | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/anm.c b/libavcodec/anm.c index 831cdfb9ac..b86b7c0ffb 100644 --- a/libavcodec/anm.c +++ b/libavcodec/anm.c @@ -65,8 +65,8 @@ static av_cold int decode_init(AVCodecContext *avctx) * @return non-zero if destination buffer is exhausted * * a copy operation is achieved when 'gb' is set - * a fill operation is acheived when 'gb' is null and pixel is >= 0 - * a skip operation is acheived when 'gb' is null and pixel is < 0 + * a fill operation is achieved when 'gb' is null and pixel is >= 0 + * a skip operation is achieved when 'gb' is null and pixel is < 0 */ static inline int op(uint8_t **dst, const uint8_t *dst_end, GetByteContext *gb, diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index e54ae69831..77980e02f8 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -548,9 +548,9 @@ typedef struct DSPContext { * @param src source array * constraints: 16-byte aligned * @param min minimum value - * constraints: must in the the range [-(1<<24), 1<<24] + * constraints: must be in the range [-(1 << 24), 1 << 24] * @param max maximum value - * constraints: must in the the range [-(1<<24), 1<<24] + * constraints: must be in the range [-(1 << 24), 1 << 24] * @param len number of elements in the array * constraints: multiple of 32 greater than zero */ diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 025a0dd156..2d6a08e032 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1744,7 +1744,7 @@ static av_always_inline void backup_mb_border(H264Context *h, uint8_t *src_y, } top_border = h->top_borders[top_idx][s->mb_x]; - /* There are two lines saved, the line above the the top macroblock + /* There are two lines saved, the line above the top macroblock * of a pair, and the line above the bottom macroblock. */ AV_COPY128(top_border, src_y + 16 * linesize); if (pixel_shift) @@ -4375,7 +4375,7 @@ again: if (ff_h264_decode_seq_parameter_set(h) < 0 && h->is_avc && (nalsize != consumed) && nalsize) { av_log(h->s.avctx, AV_LOG_DEBUG, - "SPS decoding failure, try parsing the coomplete NAL\n"); + "SPS decoding failure, trying again with the complete NAL\n"); init_get_bits(&s->gb, buf + buf_index + 1 - consumed, 8 * (nalsize - 1)); ff_h264_decode_seq_parameter_set(h); diff --git a/libavcodec/version.h b/libavcodec/version.h index f42aebe2bb..1e189f6390 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -41,7 +41,7 @@ #define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION) /** - * Those FF_API_* defines are not part of public API. + * These FF_API_* defines are not part of the public API. * They may change, break or disappear at any time. */ #ifndef FF_API_REQUEST_CHANNELS diff --git a/libavcodec/xvmc.h b/libavcodec/xvmc.h index cdec161c80..1f77e4efca 100644 --- a/libavcodec/xvmc.h +++ b/libavcodec/xvmc.h @@ -147,7 +147,7 @@ struct xvmc_pix_fmt { */ int filled_mv_blocks_num; - /** Number of the the next free data block; one data block consists of + /** Number of the next free data block; one data block consists of 64 short values in the data_blocks array. All blocks before this one have already been claimed by placing their position into the corresponding block description structure field, |