[FFmpeg-cvslog] cosmetics: fix some typos
Lou Logan
git at videolan.org
Tue Mar 13 01:19:17 CET 2012
ffmpeg | branch: master | Lou Logan <lou at lrcd.com> | Mon Mar 12 14:30:13 2012 -0800| [2d38081b4f65f23077cb1b27f2d08c82c45afa05] | committer: Michael Niedermayer
cosmetics: fix some typos
Patch attached.
>From 2d4094fc0dcb4ccd0735eb7e1719e228ebb56bb9 Mon Sep 17 00:00:00 2001
From: Lou Logan <lou at lrcd.com>
Date: Mon, 12 Mar 2012 14:13:44 -0800
Subject: [PATCH] cosmetics: fix some typos
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2d38081b4f65f23077cb1b27f2d08c82c45afa05
---
MAINTAINERS | 2 +-
doc/swresample.txt | 2 +-
libavcodec/avcodec.h | 2 +-
libavcodec/eac3dec.c | 2 +-
libavcodec/g729dec.c | 2 +-
libavcodec/mpeg4videoenc.c | 4 ++--
libavcodec/mpegvideo.h | 2 +-
libavcodec/vc1dec.c | 6 +++---
libavcodec/vp8dsp.h | 2 +-
libavfilter/vf_drawtext.c | 2 +-
libavformat/avformat.h | 2 +-
libavformat/avio.h | 2 +-
libavformat/nuv.c | 2 +-
libswresample/swresample.c | 2 +-
14 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 9441bd0..21062be 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4,7 +4,7 @@ FFmpeg maintainers
Below is a list of the people maintaining different parts of the
FFmpeg code.
-Please try to keep entries where you are the maintainer upto date!
+Please try to keep entries where you are the maintainer up to date!
Names in () mean that the maintainer currently has no time to maintain the code.
A CC after the name means that the maintainer prefers to be CC-ed on patches
diff --git a/doc/swresample.txt b/doc/swresample.txt
index 4daa181..c0f86a2 100644
--- a/doc/swresample.txt
+++ b/doc/swresample.txt
@@ -32,7 +32,7 @@ Special Converter v
Output
Planar/Packed convertion is done when needed during sample format convertion
-Every step can be skiped without memcpy when its not needed.
+Every step can be skipped without memcpy when its not needed.
Either Resampling and Rematrixing can be performed first depending on which
way its faster.
The Buffers are needed for resampling due to resamplng being a process that
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index ccbcc33..a3d5614 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 7fc1bb5..91e35ad 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 b38945c..5e55027 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 e31d2ce..b8d246d 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 14a298b..8cda2e9 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 c51ea5d..95597aa 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 d0c7d4a..c4b9aa1 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/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
index 89b0be1..987508d 100644
--- a/libavfilter/vf_drawtext.c
+++ b/libavfilter/vf_drawtext.c
@@ -123,7 +123,7 @@ typedef struct {
int x; ///< x position to start drawing text
int y; ///< y position to start drawing text
int max_glyph_w; ///< max glyph width
- int max_glyph_h; ///< max glyph heigth
+ int max_glyph_h; ///< max glyph height
int shadowx, shadowy;
unsigned int fontsize; ///< font size to use
char *fontcolor_string; ///< font color as string
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 434f355..6fa1216 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -842,7 +842,7 @@ typedef struct AVFormatContext {
#define AVFMT_FLAG_MP4A_LATM 0x8000 ///< Enable RTP MP4A-LATM payload
#define AVFMT_FLAG_SORT_DTS 0x10000 ///< try to interleave outputted packets by dts (using this flag can slow demuxing down)
#define AVFMT_FLAG_PRIV_OPT 0x20000 ///< Enable use of private options by delaying codec open (this could be made default once all code is converted)
-#define AVFMT_FLAG_KEEP_SIDE_DATA 0x40000 ///< Dont merge side data but keep it seperate.
+#define AVFMT_FLAG_KEEP_SIDE_DATA 0x40000 ///< Dont merge side data but keep it separate.
/**
* decoding: size of data to probe; encoding: unused.
diff --git a/libavformat/avio.h b/libavformat/avio.h
index c29b267..95f9558 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -383,7 +383,7 @@ int avio_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer);
/**
* Iterate through names of available protocols.
- * @note it is recommanded to use av_protocol_next() instead of this
+ * @note it is recommended to use av_protocol_next() instead of this
*
* @param opaque A private pointer representing current protocol.
* It must be a pointer to NULL on first iteration and will
diff --git a/libavformat/nuv.c b/libavformat/nuv.c
index 7c96f05..0844b56 100644
--- a/libavformat/nuv.c
+++ b/libavformat/nuv.c
@@ -277,7 +277,7 @@ static int nuv_resync(AVFormatContext *s, int64_t pos_limit) {
/**
* \brief attempts to read a timestamp from stream at the given stream position
- * \return timestamp if successfull and AV_NOPTS_VALUE if failure
+ * \return timestamp if successful and AV_NOPTS_VALUE if failure
*/
static int64_t nuv_read_dts(AVFormatContext *s, int stream_index,
int64_t *ppos, int64_t pos_limit)
diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index 7fb1ee8..dd09fc9 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
@@ -491,7 +491,7 @@ int swr_convert(struct SwrContext *s, uint8_t *out_arg[SWR_CH_MAX], int out_coun
if(s->int_sample_fmt == s->out_sample_fmt && s->out.planar){
if(preout==in){
- out_count= FFMIN(out_count, in_count); //TODO check at teh end if this is needed or redundant
+ out_count= FFMIN(out_count, in_count); //TODO check at the end if this is needed or redundant
av_assert0(s->in.planar); //we only support planar internally so it has to be, we support copying non planar though
copy(out, in, out_count);
return out_count;
More information about the ffmpeg-cvslog
mailing list