aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorLou Logan <lou@lrcd.com>2016-03-28 14:07:47 -0800
committerLou Logan <lou@lrcd.com>2016-03-28 14:13:17 -0800
commit06eef96b69d73a31f2b390955d1be0537214a0c8 (patch)
treeca45453b9853a6ad358966292639148a036f3a1a /libavcodec
parent99f2a59c2f298c2a8c0d1058759fd0ae81bc8c2e (diff)
downloadffmpeg-06eef96b69d73a31f2b390955d1be0537214a0c8.tar.gz
fix some a/an typos
Signed-off-by: Lou Logan <lou@lrcd.com>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/ass_split.h2
-rw-r--r--libavcodec/avcodec.h2
-rw-r--r--libavcodec/bitstream.c2
-rw-r--r--libavcodec/cpia.c2
-rw-r--r--libavcodec/ituh263dec.c4
-rw-r--r--libavcodec/mpegaudiodec_template.c2
-rw-r--r--libavcodec/mpegvideo.c8
7 files changed, 11 insertions, 11 deletions
diff --git a/libavcodec/ass_split.h b/libavcodec/ass_split.h
index abb6e58f14..30ce77250c 100644
--- a/libavcodec/ass_split.h
+++ b/libavcodec/ass_split.h
@@ -111,7 +111,7 @@ ASSSplitContext *ff_ass_split(const char *buf);
/**
* Split one or several ASS "Dialogue" lines from a string buffer and store
- * them in a already initialized context.
+ * them in an already initialized context.
*
* @param ctx Context previously initialized by ff_ass_split().
* @param buf String containing the ASS "Dialogue" lines.
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 637984bb26..eb8b921b72 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -91,7 +91,7 @@
* details.
*
* 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),
+ * 1. no value of an existing codec ID changes (that would break ABI),
* 2. it is as close as possible to similar codecs
*
* After adding new codec IDs, do not forget to add an entry to the codec
diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c
index 9344175977..ff9d013553 100644
--- a/libavcodec/bitstream.c
+++ b/libavcodec/bitstream.c
@@ -167,7 +167,7 @@ static int build_table(VLC *vlc, int table_nb_bits, int nb_codes,
int table_size, table_index, index, code_prefix, symbol, subtable_bits;
int i, j, k, n, nb, inc;
uint32_t code;
- volatile VLC_TYPE (* volatile table)[2]; // the double volatile is needed to prevent a internal compiler error in gcc 4.2
+ volatile VLC_TYPE (* volatile table)[2]; // the double volatile is needed to prevent an internal compiler error in gcc 4.2
table_size = 1 << table_nb_bits;
if (table_nb_bits > 30)
diff --git a/libavcodec/cpia.c b/libavcodec/cpia.c
index 6b784b2051..07cdd50368 100644
--- a/libavcodec/cpia.c
+++ b/libavcodec/cpia.c
@@ -134,7 +134,7 @@ static int cpia_decode_frame(AVCodecContext *avctx,
v_end = v + frame->linesize[2] - 1;
if ((i & 1) && header[17] == SUBSAMPLE_420) {
- /* We are on a odd line and 420 subsample is used.
+ /* We are on an odd line and 420 subsample is used.
* On this line only Y values are specified, one per pixel.
*/
for (j = 0; j < linelength - 1; j++) {
diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c
index 2e449f8eeb..00be202e62 100644
--- a/libavcodec/ituh263dec.c
+++ b/libavcodec/ituh263dec.c
@@ -167,7 +167,7 @@ static int h263_decode_gob_header(MpegEncContext *s)
/* We have a GBSC probably with GSTUFF */
skip_bits(&s->gb, 16); /* Drop the zeros */
left= get_bits_left(&s->gb);
- //MN: we must check the bits left or we might end in a infinite loop (or segfault)
+ //MN: we must check the bits left or we might end in an infinite loop (or segfault)
for(;left>13; left--){
if(get_bits1(&s->gb)) break; /* Seek the '1' bit */
}
@@ -313,7 +313,7 @@ static int h263p_decode_umotion(MpegEncContext * s, int pred)
}
/**
- * read the next MVs for OBMC. yes this is a ugly hack, feel free to send a patch :)
+ * read the next MVs for OBMC. yes this is an ugly hack, feel free to send a patch :)
*/
static void preview_obmc(MpegEncContext *s){
GetBitContext gb= s->gb;
diff --git a/libavcodec/mpegaudiodec_template.c b/libavcodec/mpegaudiodec_template.c
index 5e3fe7e986..6300bb11c0 100644
--- a/libavcodec/mpegaudiodec_template.c
+++ b/libavcodec/mpegaudiodec_template.c
@@ -830,7 +830,7 @@ static void switch_buffer(MPADecodeContext *s, int *pos, int *end_pos,
}
}
-/* Following is a optimized code for
+/* Following is an optimized code for
INTFLOAT v = *src
if(get_bits1(&s->gb))
v = -v;
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 236987b3d4..bc78039c1e 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -772,7 +772,7 @@ static int init_context_frame(MpegEncContext *s)
if (s->h263_pred || s->h263_plus || !s->encoding) {
/* dc values */
- // MN: we need these for error resilience of intra-frames
+ // MN: we need these for error resilience of intra-frames
FF_ALLOCZ_OR_GOTO(s->avctx, s->dc_val_base, yc_size * sizeof(int16_t), fail);
s->dc_val[0] = s->dc_val_base + s->b8_stride + 1;
s->dc_val[1] = s->dc_val_base + y_size + s->mb_stride + 1;
@@ -781,13 +781,13 @@ static int init_context_frame(MpegEncContext *s)
s->dc_val_base[i] = 1024;
}
- /* which mb is a intra block */
+ /* which mb is an intra block */
FF_ALLOCZ_OR_GOTO(s->avctx, s->mbintra_table, mb_array_size, fail);
memset(s->mbintra_table, 1, mb_array_size);
/* init macroblock skip table */
FF_ALLOCZ_OR_GOTO(s->avctx, s->mbskip_table, mb_array_size + 2, fail);
- // Note the + 1 is for a quicker mpeg4 slice_end detection
+ // Note the + 1 is for a quicker mpeg4 slice_end detection
return ff_mpeg_er_init(s);
fail:
@@ -1224,7 +1224,7 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx)
}
if (s->current_picture_ptr && !s->current_picture_ptr->f->buf[0]) {
- // we already have a unused image
+ // we already have an unused image
// (maybe it was set before reading the header)
pic = s->current_picture_ptr;
} else {