aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2011-10-05 14:12:42 +0200
committerDiego Biurrun <diego@biurrun.de>2011-12-11 00:32:25 +0100
commitda9cea77e314dad2fbc615a76085a0c330741f92 (patch)
tree7ddbdbf1749d1ee7c66c83f76f66bd50367b246d /libavcodec
parent2e87b4c51152e0241cae7f655d53920029a0e632 (diff)
downloadffmpeg-da9cea77e314dad2fbc615a76085a0c330741f92.tar.gz
Fix a bunch of common typos.
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/avcodec.h4
-rw-r--r--libavcodec/bitstream.c2
-rw-r--r--libavcodec/dsputil.h4
-rw-r--r--libavcodec/eatgv.c4
-rw-r--r--libavcodec/error_resilience.c2
-rw-r--r--libavcodec/g722enc.c2
-rw-r--r--libavcodec/h264.c6
-rw-r--r--libavcodec/jfdctint_template.c2
-rw-r--r--libavcodec/lpc.h2
-rw-r--r--libavcodec/mjpegdec.c6
-rw-r--r--libavcodec/mpegvideo.h2
-rw-r--r--libavcodec/proresdec.c2
-rw-r--r--libavcodec/tscc.c2
-rw-r--r--libavcodec/vaapi_mpeg4.c2
-rw-r--r--libavcodec/vc1dec.c6
-rw-r--r--libavcodec/wmaprodec.c2
-rw-r--r--libavcodec/wmavoice.c4
-rw-r--r--libavcodec/x86/vc1dsp_yasm.asm2
18 files changed, 28 insertions, 28 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 669afe80ba..ae5ce6e314 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1274,7 +1274,7 @@ typedef struct AVCodecContext {
* Some codecs need additional format info. It is stored here.
* If any muxer uses this then ALL demuxers/parsers AND encoders for the
* specific codec MUST set it correctly otherwise stream copy breaks.
- * In general use of this field by muxers is not recommanded.
+ * In general use of this field by muxers is not recommended.
* - encoding: Set by libavcodec.
* - decoding: Set by libavcodec. (FIXME: Is this OK?)
*/
@@ -3444,7 +3444,7 @@ typedef struct ReSampleContext ReSampleContext;
* @param linear if 1 then the used FIR filter will be linearly interpolated
between the 2 closest, if 0 the closest will be used
* @param cutoff cutoff frequency, 1.0 corresponds to half the output sampling rate
- * @return allocated ReSampleContext, NULL if error occured
+ * @return allocated ReSampleContext, NULL if error occurred
*/
ReSampleContext *av_audio_resample_init(int output_channels, int input_channels,
int output_rate, int input_rate,
diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c
index 68ea3e0bda..14e392f34d 100644
--- a/libavcodec/bitstream.c
+++ b/libavcodec/bitstream.c
@@ -103,7 +103,7 @@ static int alloc_table(VLC *vlc, int size, int use_static)
vlc->table_size += size;
if (vlc->table_size > vlc->table_allocated) {
if(use_static)
- abort(); //cant do anything, init_vlc() is used with too little memory
+ abort(); // cannot do anything, init_vlc() is used with too little memory
vlc->table_allocated += (1 << vlc->bits);
vlc->table = av_realloc(vlc->table,
sizeof(VLC_TYPE) * 2 * vlc->table_allocated);
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index 98b7b1eeaa..300160986c 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -498,8 +498,8 @@ typedef struct DSPContext {
* with the zigzag/alternate scan<br>
* an example to avoid confusion:
* - (->decode coeffs -> zigzag reorder -> dequant -> reference idct ->...)
- * - (x -> referece dct -> reference idct -> x)
- * - (x -> referece dct -> simple_mmx_perm = idct_permutation -> simple_idct_mmx -> x)
+ * - (x -> reference dct -> reference idct -> x)
+ * - (x -> reference dct -> simple_mmx_perm = idct_permutation -> simple_idct_mmx -> x)
* - (->decode coeffs -> zigzag reorder -> simple_mmx_perm -> dequant -> simple_idct_mmx ->...)
*/
uint8_t idct_permutation[64];
diff --git a/libavcodec/eatgv.c b/libavcodec/eatgv.c
index 917308f571..597d0db8da 100644
--- a/libavcodec/eatgv.c
+++ b/libavcodec/eatgv.c
@@ -155,7 +155,7 @@ static int tgv_decode_inter(TgvContext * s, const uint8_t *buf, const uint8_t *b
vector_bits = AV_RL16(&buf[6]);
buf += 12;
- /* allocate codebook buffers as neccessary */
+ /* allocate codebook buffers as necessary */
if (num_mvs > s->num_mvs) {
s->mv_codebook = av_realloc(s->mv_codebook, num_mvs*2*sizeof(int));
s->num_mvs = num_mvs;
@@ -286,7 +286,7 @@ static int tgv_decode_frame(AVCodecContext *avctx,
s->frame.buffer_hints = FF_BUFFER_HINTS_VALID;
s->frame.linesize[0] = s->width;
- /* allocate additional 12 bytes to accomodate av_memcpy_backptr() OUTBUF_PADDED optimisation */
+ /* allocate additional 12 bytes to accommodate av_memcpy_backptr() OUTBUF_PADDED optimisation */
s->frame.data[0] = av_malloc(s->width*s->height + 12);
if (!s->frame.data[0])
return AVERROR(ENOMEM);
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c
index 23ac904c6c..a2e911b951 100644
--- a/libavcodec/error_resilience.c
+++ b/libavcodec/error_resilience.c
@@ -790,7 +790,7 @@ void ff_er_frame_end(MpegEncContext *s){
if(!s->error_recognition || s->error_count==0 || s->avctx->lowres ||
s->avctx->hwaccel ||
s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU ||
- s->picture_structure != PICT_FRAME || // we dont support ER of field pictures yet, though it should not crash if enabled
+ s->picture_structure != PICT_FRAME || // we do not support ER of field pictures yet, though it should not crash if enabled
s->error_count==3*s->mb_width*(s->avctx->skip_top + s->avctx->skip_bottom)) return;
if (s->current_picture.f.motion_val[0] == NULL) {
diff --git a/libavcodec/g722enc.c b/libavcodec/g722enc.c
index f8db49aba8..1eed784a72 100644
--- a/libavcodec/g722enc.c
+++ b/libavcodec/g722enc.c
@@ -153,7 +153,7 @@ static int g722_encode_trellis(AVCodecContext *avctx,
for (j = 0; j < frontier && nodes[0][j]; j++) {
/* Only k >> 2 affects the future adaptive state, therefore testing
- * small steps that don't change k >> 2 is useless, the orignal
+ * small steps that don't change k >> 2 is useless, the original
* value from encode_low is better than them. Since we step k
* in steps of 4, make sure range is a multiple of 4, so that
* we don't miss the original value from encode_low. */
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index acd7179cc0..285aae81e5 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2893,7 +2893,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
* FIXME: avoiding a memcpy would be nice, but ref handling makes many assumptions
* about there being no actual duplicates.
* FIXME: this doesn't copy padding for out-of-frame motion vectors. Given we're
- * concealing a lost frame, this probably isn't noticable by comparison, but it should
+ * concealing a lost frame, this probably isn't noticeable by comparison, but it should
* be fixed. */
if (h->short_ref_count) {
if (prev) {
@@ -3316,7 +3316,7 @@ static av_always_inline void fill_filter_caches_inter(H264Context *h, MpegEncCon
/**
*
- * @return non zero if the loop filter can be skiped
+ * @return non zero if the loop filter can be skipped
*/
static int fill_filter_caches(H264Context *h, int mb_type){
MpegEncContext * const s = &h->s;
@@ -3839,7 +3839,7 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){
av_log(h->s.avctx, AV_LOG_ERROR, "Invalid mix of idr and non-idr slices");
return -1;
}
- idr(h); //FIXME ensure we don't loose some frames if there is reordering
+ idr(h); // FIXME ensure we don't lose some frames if there is reordering
case NAL_SLICE:
init_get_bits(&hx->s.gb, ptr, bit_length);
hx->intra_gb_ptr=
diff --git a/libavcodec/jfdctint_template.c b/libavcodec/jfdctint_template.c
index 02b6f09381..5175390710 100644
--- a/libavcodec/jfdctint_template.c
+++ b/libavcodec/jfdctint_template.c
@@ -340,7 +340,7 @@ FUNC(ff_jpeg_fdct_islow)(DCTELEM *data)
/*
* The secret of DCT2-4-8 is really simple -- you do the usual 1-DCT
- * on the rows and then, instead of doing even and odd, part on the colums
+ * on the rows and then, instead of doing even and odd, part on the columns
* you do even part two times.
*/
GLOBAL(void)
diff --git a/libavcodec/lpc.h b/libavcodec/lpc.h
index 8cc2362e5b..2a944b6f48 100644
--- a/libavcodec/lpc.h
+++ b/libavcodec/lpc.h
@@ -67,7 +67,7 @@ typedef struct LPCContext {
* Perform autocorrelation on input samples with delay of 0 to lag.
* @param data input samples.
* constraints: no alignment needed, but must have have at
- * least lag*sizeof(double) valid bytes preceeding it, and
+ * least lag*sizeof(double) valid bytes preceding it, and
* size must be at least (len+1)*sizeof(double) if data is
* 16-byte aligned or (len+2)*sizeof(double) if data is
* unaligned.
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 0a1236c225..17e87ed65b 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1109,9 +1109,9 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
av_log(s->avctx, AV_LOG_DEBUG, "APPx %8X\n", id);
}
- /* buggy AVID, it puts EOI only at every 10th frame */
- /* also this fourcc is used by non-avid files too, it holds some
- informations, but it's always present in AVID creates files */
+ /* Buggy AVID, it puts EOI only at every 10th frame. */
+ /* Also, this fourcc is used by non-avid files too, it holds some
+ information, but it's always present in AVID-created files. */
if (id == AV_RL32("AVI1"))
{
/* structure:
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 46ad5d8306..01df491907 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -127,7 +127,7 @@ typedef struct Picture{
int ref_poc[2][2][16]; ///< h264 POCs of the frames 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 mb_var_sum; ///< sum of MB variance for current frame
int mc_mb_var_sum; ///< motion compensated MB variance for current frame
diff --git a/libavcodec/proresdec.c b/libavcodec/proresdec.c
index b4c794564b..46434df263 100644
--- a/libavcodec/proresdec.c
+++ b/libavcodec/proresdec.c
@@ -559,7 +559,7 @@ static int decode_slice(AVCodecContext *avctx, ProresThreadData *td)
sf = sf > 128 ? (sf - 96) << 2 : sf;
/* scale quantization matrixes according with slice's scale factor */
- /* TODO: this can be SIMD-optimized alot */
+ /* TODO: this can be SIMD-optimized a lot */
if (ctx->qmat_changed || sf != ctx->prev_slice_sf) {
ctx->prev_slice_sf = sf;
for (i = 0; i < 64; i++) {
diff --git a/libavcodec/tscc.c b/libavcodec/tscc.c
index df4b09b07c..90d203dd77 100644
--- a/libavcodec/tscc.c
+++ b/libavcodec/tscc.c
@@ -155,7 +155,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
return -1;
}
c->bpp = avctx->bits_per_coded_sample;
- // buffer size for RLE 'best' case when 2-byte code preceeds each pixel and there may be padding after it too
+ // buffer size for RLE 'best' case when 2-byte code precedes each pixel and there may be padding after it too
c->decomp_size = (((avctx->width * c->bpp + 7) >> 3) + 3 * avctx->width + 2) * avctx->height + 2;
/* Allocate decompression buffer */
diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c
index 915632844e..41d54c6116 100644
--- a/libavcodec/vaapi_mpeg4.c
+++ b/libavcodec/vaapi_mpeg4.c
@@ -98,7 +98,7 @@ static int vaapi_mpeg4_start_frame(AVCodecContext *avctx, av_unused const uint8_
pic_param->forward_reference_picture = ff_vaapi_get_surface_id(&s->last_picture);
/* Fill in VAIQMatrixBufferMPEG4 */
- /* Only the first inverse quantisation method uses the weighthing matrices */
+ /* Only the first inverse quantisation method uses the weighting matrices */
if (pic_param->vol_fields.bits.quant_type) {
iq_matrix = ff_vaapi_alloc_iq_matrix(vactx, sizeof(VAIQMatrixBufferMPEG4));
if (!iq_matrix)
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 7c9e906505..0340dc202d 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -3536,7 +3536,7 @@ static void vc1_apply_p_loop_filter(VC1Context *v)
vc1_apply_p_v_loop_filter(v, i);
}
- /* V always preceedes H, therefore we run H one MB before V;
+ /* V always precedes H, therefore we run H one MB before V;
* at the end of a row, we catch up to complete the row */
if (s->mb_x) {
for (i = 0; i < 6; i++) {
@@ -3573,7 +3573,7 @@ static int vc1_decode_p_mb(VC1Context *v)
int skipped, fourmv;
int block_cbp = 0, pat, block_tt = 0, block_intra = 0;
- mquant = v->pq; /* Loosy initialization */
+ mquant = v->pq; /* lossy initialization */
if (v->mv_type_is_raw)
fourmv = get_bits1(gb);
@@ -4141,7 +4141,7 @@ static void vc1_decode_b_mb(VC1Context *v)
int dmv_x[2], dmv_y[2];
int bmvtype = BMV_TYPE_BACKWARD;
- mquant = v->pq; /* Loosy initialization */
+ mquant = v->pq; /* lossy initialization */
s->mb_intra = 0;
if (v->dmb_is_raw)
diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c
index c46a983602..b947eb800f 100644
--- a/libavcodec/wmaprodec.c
+++ b/libavcodec/wmaprodec.c
@@ -1425,7 +1425,7 @@ static int remaining_bits(WMAProDecodeCtx *s, GetBitContext *gb)
*@param s codec context
*@param gb bitstream reader context
*@param len length of the partial frame
- *@param append decides wether to reset the buffer or not
+ *@param append decides whether to reset the buffer or not
*/
static void save_bits(WMAProDecodeCtx *s, GetBitContext* gb, int len,
int append)
diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c
index 6f3a6b2372..00e985d230 100644
--- a/libavcodec/wmavoice.c
+++ b/libavcodec/wmavoice.c
@@ -189,7 +189,7 @@ typedef struct {
* @{
*/
int spillover_nbits; ///< number of bits of the previous packet's
- ///< last superframe preceeding this
+ ///< last superframe preceding this
///< packet's first full superframe (useful
///< for re-synchronization also)
int has_residual_lsps; ///< if set, superframes contain one set of
@@ -1805,7 +1805,7 @@ static int synth_superframe(AVCodecContext *ctx, int *got_frame_ptr)
s->frame.nb_samples = n_samples;
samples = (float *)s->frame.data[0];
- /* Parse frames, optionally preceeded by per-frame (independent) LSPs. */
+ /* Parse frames, optionally preceded by per-frame (independent) LSPs. */
for (n = 0; n < 3; n++) {
if (!s->has_residual_lsps) {
int m;
diff --git a/libavcodec/x86/vc1dsp_yasm.asm b/libavcodec/x86/vc1dsp_yasm.asm
index 220cc03da3..66f61dba6a 100644
--- a/libavcodec/x86/vc1dsp_yasm.asm
+++ b/libavcodec/x86/vc1dsp_yasm.asm
@@ -227,7 +227,7 @@ section .text
imul r2, 0x01010101
%endmacro
-; I dont know why the sign extension is needed...
+; I do not know why the sign extension is needed...
%macro PSIGNW_SRA_MMX 2
psraw %2, 15
PSIGNW_MMX %1, %2