From 511cf612ac979f536fd65e14603a87ca5ad435f3 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 19 Dec 2012 18:48:21 +0100 Subject: miscellaneous typo fixes --- libavcodec/4xm.c | 2 +- libavcodec/aacpsy.c | 4 ++-- libavcodec/ac3dec.c | 2 +- libavcodec/ac3enc.c | 2 +- libavcodec/acelp_filters.h | 2 +- libavcodec/avcodec.h | 2 +- libavcodec/bitstream.c | 2 +- libavcodec/eac3dec.c | 2 +- libavcodec/ffv1dec.c | 2 +- libavcodec/flicvideo.c | 2 +- libavcodec/g726.c | 2 +- libavcodec/h264_direct.c | 2 +- libavcodec/indeo3data.h | 4 ++-- libavcodec/lagarith.c | 4 ++-- libavcodec/libfdk-aacenc.c | 2 +- libavcodec/libtheoraenc.c | 2 +- libavcodec/mpeg4videoenc.c | 4 ++-- libavcodec/parser.c | 2 +- libavcodec/pngenc.c | 2 +- libavcodec/ratecontrol.c | 2 +- libavcodec/resample.c | 2 +- libavcodec/rv10.c | 2 +- libavcodec/shorten.c | 3 ++- libavcodec/thread.h | 2 +- libavcodec/vda_h264.c | 2 +- libavcodec/vorbisdec.c | 2 +- libavcodec/vp8dsp.h | 2 +- libavcodec/wmaprodec.c | 4 ++-- 28 files changed, 34 insertions(+), 33 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index f78a0a21b2..66149cc3e7 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -796,7 +796,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, cfrm->size + data_size + FF_INPUT_BUFFER_PADDING_SIZE); // explicit check needed as memcpy below might not catch a NULL if (!cfrm->data) { - av_log(f->avctx, AV_LOG_ERROR, "realloc falure"); + av_log(f->avctx, AV_LOG_ERROR, "realloc failure"); return -1; } diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c index 42db471428..e4b4405144 100644 --- a/libavcodec/aacpsy.c +++ b/libavcodec/aacpsy.c @@ -592,7 +592,7 @@ static void psy_3gpp_analyze_channel(FFPsyContext *ctx, int channel, for (w = 0; w < wi->num_windows*16; w += 16) { AacPsyBand *bands = &pch->band[w]; - //5.4.2.3 "Spreading" & 5.4.3 "Spreaded Energy Calculation" + /* 5.4.2.3 "Spreading" & 5.4.3 "Spread Energy Calculation" */ spread_en[0] = bands[0].energy; for (g = 1; g < num_bands; g++) { bands[g].thr = FFMAX(bands[g].thr, bands[g-1].thr * coeffs[g].spread_hi[0]); @@ -612,7 +612,7 @@ static void psy_3gpp_analyze_channel(FFPsyContext *ctx, int channel, band->thr = FFMAX(PSY_3GPP_RPEMIN*band->thr, FFMIN(band->thr, PSY_3GPP_RPELEV*pch->prev_band[w+g].thr_quiet)); - /* 5.6.1.3.1 "Prepatory steps of the perceptual entropy calculation" */ + /* 5.6.1.3.1 "Preparatory steps of the perceptual entropy calculation" */ pe += calc_pe_3gpp(band); a += band->pe_const; active_lines += band->active_lines; diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index acefe41644..f15bfa2a07 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -546,7 +546,7 @@ static void decode_transform_coeffs(AC3DecodeContext *s, int blk) for (ch = 1; ch <= s->channels; ch++) { /* transform coefficients for full-bandwidth channel */ decode_transform_coeffs_ch(s, blk, ch, &m); - /* tranform coefficients for coupling channel come right after the + /* transform coefficients for coupling channel come right after the coefficients for the first coupled channel*/ if (s->channel_in_cpl[ch]) { if (!got_cplchan) { diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c index 6d038ef914..c0acc64850 100644 --- a/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c @@ -659,7 +659,7 @@ static void count_frame_bits_fixed(AC3EncodeContext *s) * bit allocation parameters do not change between blocks * no delta bit allocation * no skipped data - * no auxilliary data + * no auxiliary data * no E-AC-3 metadata */ diff --git a/libavcodec/acelp_filters.h b/libavcodec/acelp_filters.h index b8715d266f..6a9ebd943e 100644 --- a/libavcodec/acelp_filters.h +++ b/libavcodec/acelp_filters.h @@ -32,7 +32,7 @@ * the coefficients are scaled by 2^15. * This array only contains the right half of the filter. * This filter is likely identical to the one used in G.729, though this - * could not be determined from the original comments with certainity. + * could not be determined from the original comments with certainty. */ extern const int16_t ff_acelp_interp_filter[61]; diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 29e3701e45..d12c72b74c 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2292,7 +2292,7 @@ typedef struct AVCodecContext { /** * ratecontrol qmin qmax limiting method - * 0-> clipping, 1-> use a nice continous function to limit qscale wthin qmin/qmax. + * 0-> clipping, 1-> use a nice continuous function to limit qscale wthin qmin/qmax. * - encoding: Set by user. * - decoding: unused */ diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c index eec2f6dcb2..2c8692a79d 100644 --- a/libavcodec/bitstream.c +++ b/libavcodec/bitstream.c @@ -169,7 +169,7 @@ static int build_table(VLC *vlc, int table_nb_bits, int nb_codes, table[i][0] = -1; //codes } - /* first pass: map codes and compute auxillary table sizes */ + /* first pass: map codes and compute auxiliary table sizes */ for (i = 0; i < nb_codes; i++) { n = codes[i].bits; code = codes[i].code; diff --git a/libavcodec/eac3dec.c b/libavcodec/eac3dec.c index 639e061f5a..3a80cb1469 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/ffv1dec.c b/libavcodec/ffv1dec.c index b1dec7de3f..72f255cad1 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -824,7 +824,7 @@ static int ffv1_decode_frame(AVCodecContext *avctx, void *data, } else { if (!f->key_frame_ok) { av_log(avctx, AV_LOG_ERROR, - "Cant decode non keyframe without valid keyframe\n"); + "Cannot decode non-keyframe without valid keyframe\n"); return AVERROR_INVALIDDATA; } p->key_frame = 0; diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c index 02bfc75da4..d2cc6cdb41 100644 --- a/libavcodec/flicvideo.c +++ b/libavcodec/flicvideo.c @@ -581,7 +581,7 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx, } /* Now FLX is strange, in that it is "byte" as opposed to "pixel" run length compressed. - * This does not give us any good oportunity to perform word endian conversion + * This does not give us any good opportunity to perform word endian conversion * during decompression. So if it is required (i.e., this is not a LE target, we do * a second pass over the line here, swapping the bytes. */ diff --git a/libavcodec/g726.c b/libavcodec/g726.c index 3e313b9752..dbe9e02240 100644 --- a/libavcodec/g726.c +++ b/libavcodec/g726.c @@ -34,7 +34,7 @@ /** * G.726 11bit float. * G.726 Standard uses rather odd 11bit floating point arithmentic for - * numerous occasions. It's a mistery to me why they did it this way + * numerous occasions. It's a mystery to me why they did it this way * instead of simply using 32bit integer arithmetic. */ typedef struct Float11 { diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c index bf444958bf..2306b975b5 100644 --- a/libavcodec/h264_direct.c +++ b/libavcodec/h264_direct.c @@ -86,7 +86,7 @@ static void fill_colmap(H264Context *h, int map[2][16+32], int list, int field, if (!interl) poc |= 3; - else if( interl && (poc&3) == 3) //FIXME store all MBAFF references so this isnt needed + else if( interl && (poc&3) == 3) // FIXME: store all MBAFF references so this is not needed poc= (poc&~3) + rfield + 1; for(j=start; jhandle, AACENC_BANDWIDTH, avctx->cutoff)) != AACENC_OK) { - av_log(avctx, AV_LOG_ERROR, "Unable to set the encoder bandwith to %d: %s\n", + av_log(avctx, AV_LOG_ERROR, "Unable to set the encoder bandwidth to %d: %s\n", avctx->cutoff, aac_get_error(err)); goto error; } diff --git a/libavcodec/libtheoraenc.c b/libavcodec/libtheoraenc.c index e57310ac33..f20fabb8d6 100644 --- a/libavcodec/libtheoraenc.c +++ b/libavcodec/libtheoraenc.c @@ -338,7 +338,7 @@ static int encode_frame(AVCodecContext* avc_context, AVPacket *pkt, memcpy(pkt->data, o_packet.packet, o_packet.bytes); // HACK: assumes no encoder delay, this is true until libtheora becomes - // multithreaded (which will be disabled unless explictly requested) + // multithreaded (which will be disabled unless explicitly requested) pkt->pts = pkt->dts = frame->pts; avc_context->coded_frame->key_frame = !(o_packet.granulepos & h->keyframe_mask); if (avc_context->coded_frame->key_frame) diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index b145eb229b..986cba62fa 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/parser.c b/libavcodec/parser.c index 0767a34959..6e755f6b75 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -96,7 +96,7 @@ void ff_fetch_timestamp(AVCodecParserContext *s, int off, int remove){ if ( s->cur_offset + off >= s->cur_frame_offset[i] && (s->frame_offset < s->cur_frame_offset[i] || (!s->frame_offset && !s->next_frame_offset)) // first field/frame - //check is disabled because mpeg-ts doesnt send complete PES packets + // check disabled since MPEG-TS does not send complete PES packets && /*s->next_frame_offset + off <*/ s->cur_frame_end[i]){ s->dts= s->cur_frame_dts[i]; s->pts= s->cur_frame_pts[i]; diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c index 00a800c795..b20a6d6d46 100644 --- a/libavcodec/pngenc.c +++ b/libavcodec/pngenc.c @@ -367,7 +367,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, int pass; for(pass = 0; pass < NB_PASSES; pass++) { - /* NOTE: a pass is completely omited if no pixels would be + /* NOTE: a pass is completely omitted if no pixels would be output */ pass_row_size = ff_png_pass_row_size(pass, bits_per_pixel, avctx->width); if (pass_row_size > 0) { diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index 2cb5eeaefe..e0b6e9bf0b 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -799,7 +799,7 @@ static int init_pass2(MpegEncContext *s) AVCodecContext *a= s->avctx; int i, toobig; double fps= 1/av_q2d(s->avctx->time_base); - double complexity[5]={0,0,0,0,0}; // aproximate bits at quant=1 + double complexity[5]={0,0,0,0,0}; // approximate bits at quant=1 uint64_t const_bits[5]={0,0,0,0,0}; // quantizer independent bits uint64_t all_const_bits; uint64_t all_available_bits= (uint64_t)(s->bit_rate*(double)rcc->num_entries/fps); diff --git a/libavcodec/resample.c b/libavcodec/resample.c index 20d7078113..1b3bb834f3 100644 --- a/libavcodec/resample.c +++ b/libavcodec/resample.c @@ -350,7 +350,7 @@ int audio_resample(ReSampleContext *s, short *output, short *input, int nb_sampl if (av_audio_convert(s->convert_ctx[1], obuf, ostride, ibuf, istride, nb_samples1 * s->output_channels) < 0) { av_log(s->resample_context, AV_LOG_ERROR, - "Audio sample format convertion failed\n"); + "Audio sample format conversion failed\n"); return 0; } } diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index 73af3622e6..9239cf7d94 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -706,7 +706,7 @@ static int rv10_decode_frame(AVCodecContext *avctx, *got_frame = 1; ff_print_debug_info(s, pict); } - s->current_picture_ptr= NULL; //so we can detect if frame_end wasnt called (find some nicer solution...) + s->current_picture_ptr= NULL; // so we can detect if frame_end was not called (find some nicer solution...) } return avpkt->size; diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index fad69b8d08..1dc010f441 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -528,7 +528,8 @@ static int shorten_decode_frame(AVCodecContext *avctx, void *data, /* get Rice code for residual decoding */ if (cmd != FN_ZERO) { residual_size = get_ur_golomb_shorten(&s->gb, ENERGYSIZE); - /* this is a hack as version 0 differed in defintion of get_sr_golomb_shorten */ + /* This is a hack as version 0 differed in the definition + * of get_sr_golomb_shorten(). */ if (s->version == 0) residual_size--; } diff --git a/libavcodec/thread.h b/libavcodec/thread.h index 782c03cbcf..99b0ce146a 100644 --- a/libavcodec/thread.h +++ b/libavcodec/thread.h @@ -43,7 +43,7 @@ void ff_thread_flush(AVCodecContext *avctx); * Returns the next available frame in picture. *got_picture_ptr * will be 0 if none is available. * The return value on success is the size of the consumed packet for - * compatiblity with avcodec_decode_video2(). This means the decoder + * compatibility with avcodec_decode_video2(). This means the decoder * has to consume the full packet. * * Parameters are the same as avcodec_decode_video2(). diff --git a/libavcodec/vda_h264.c b/libavcodec/vda_h264.c index 2a78aac61a..34fcd3c6e1 100644 --- a/libavcodec/vda_h264.c +++ b/libavcodec/vda_h264.c @@ -281,7 +281,7 @@ int ff_vda_create_decoder(struct vda_context *vda_ctx, #endif /* Each VCL NAL in the bistream sent to the decoder - * is preceeded by a 4 bytes length header. + * is preceded by a 4 bytes length header. * Change the avcC atom header if needed, to signal headers of 4 bytes. */ if (extradata_size >= 4 && (extradata[4] & 0x03) != 0x03) { uint8_t *rw_extradata; diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index b30e614c2f..aac9019ed6 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -1233,7 +1233,7 @@ static int vorbis_floor1_decode(vorbis_context *vc, if (highroom < lowroom) { room = highroom * 2; } else { - room = lowroom * 2; // SPEC mispelling + room = lowroom * 2; // SPEC misspelling } if (val) { floor1_flag[low_neigh_offs] = 1; diff --git a/libavcodec/vp8dsp.h b/libavcodec/vp8dsp.h index 62cc010989..bce0062c51 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]; diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index 321c25d9f1..e19c3d36b9 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -533,7 +533,7 @@ static int decode_tilehdr(WMAProDecodeCtx *s) int c; /* Should never consume more than 3073 bits (256 iterations for the - * while loop when always the minimum amount of 128 samples is substracted + * while loop when always the minimum amount of 128 samples is subtracted * from missing samples in the 8 channel case). * 1 + BLOCK_MAX_SIZE * MAX_CHANNELS / BLOCK_MIN_SIZE * (MAX_CHANNELS + 4) */ @@ -1089,7 +1089,7 @@ static int decode_subframe(WMAProDecodeCtx *s) s->channels_for_cur_subframe = 0; for (i = 0; i < s->avctx->channels; i++) { const int cur_subframe = s->channel[i].cur_subframe; - /** substract already processed samples */ + /** subtract already processed samples */ total_samples -= s->channel[i].decoded_samples; /** and count if there are multiple subframes that match our profile */ -- cgit v1.2.3