misc typo fixes

Originally committed as revision 9291 to svn://svn.ffmpeg.org/ffmpeg/trunk

17 files changed, 27 insertions, 24 deletions

diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index 030b0edd50..d0e8344c51 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -1272,7 +1272,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
 
         init_get_bits(&gb, buf, size);
 
-        //read bits & inital values
+        //read bits & initial values
         nb_bits = get_bits(&gb, 2)+2;
         //av_log(NULL,AV_LOG_INFO,"nb_bits: %d\n", nb_bits);
         table = swf_index_tables[nb_bits-2];
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index 9076c614fd..6e9badc25b 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -3139,7 +3139,7 @@ void ff_block_permute(DCTELEM *block, uint8_t *permutation, const uint8_t *scant
     DCTELEM temp[64];
 
     if(last<=0) return;
-    //if(permutation[1]==1) return; //FIXME its ok but not clean and might fail for some perms
+    //if(permutation[1]==1) return; //FIXME it is ok but not clean and might fail for some permutations
 
     for(i=0; i<=last; i++){
         const int j= scantable[i];
diff --git a/libavcodec/eval.h b/libavcodec/eval.h
index 71993c5628..0a1cd87f6d 100644
--- a/libavcodec/eval.h
+++ b/libavcodec/eval.h
@@ -68,7 +68,7 @@ typedef struct ff_expr_s AVEvalExpr;
  * @param func1_name NULL terminated array of zero terminated strings of func1 identifers
  * @param func2_name NULL terminated array of zero terminated strings of func2 identifers
  * @param error pointer to a char* which is set to an error message if something goes wrong
- * @return AVEvalExpr which must be freed with ff_eval_free by the user when its not needed anymore
+ * @return AVEvalExpr which must be freed with ff_eval_free by the user when it is not needed anymore
  *         NULL if anything went wrong
  */
 AVEvalExpr * ff_parse(char *s, const char **const_name,
diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c
index 5ccc79b4c6..7326b5d8c0 100644
--- a/libavcodec/flicvideo.c
+++ b/libavcodec/flicvideo.c
@@ -584,7 +584,7 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx,
                  * a second pass over the line here, swapping the bytes.
                  */
                 pixel = 0xFF00;
-                if (0xFF00 != AV_RL16(&pixel)) /* Check if its not an LE Target */
+                if (0xFF00 != AV_RL16(&pixel)) /* Check if it is not an LE target */
                 {
                   pixel_ptr = y_ptr;
                   pixel_countdown = s->avctx->width;
diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c
index 017bf1cd22..7f8f141067 100644
--- a/libavcodec/h261dec.c
+++ b/libavcodec/h261dec.c
@@ -164,7 +164,7 @@ static int ff_h261_resync(H261Context *h){
             if(ret>=0)
                 return 0;
         }
-        //ok, its not where its supposed to be ...
+        //OK, it is not where it is supposed to be ...
         s->gb= s->last_resync_gb;
         align_get_bits(&s->gb);
         left= s->gb.size_in_bits - get_bits_count(&s->gb);
diff --git a/libavcodec/h263.c b/libavcodec/h263.c
index 0719d7e6c7..18b3856909 100644
--- a/libavcodec/h263.c
+++ b/libavcodec/h263.c
@@ -3386,7 +3386,7 @@ int ff_h263_resync(MpegEncContext *s){
         if(ret>=0)
             return 0;
     }
-    //ok, it's not where its supposed to be ...
+    //OK, it's not where it is supposed to be ...
     s->gb= s->last_resync_gb;
     align_get_bits(&s->gb);
     left= s->gb.size_in_bits - get_bits_count(&s->gb);
@@ -4720,7 +4720,7 @@ retry:
         i += run;
         if (i >= 64){
             if(s->alt_inter_vlc && rl == &rl_inter && !s->mb_intra){
-                //looks like a hack but no, it's the way its supposed to work ...
+                //Looks like a hack but no, it's the way it is supposed to work ...
                 rl = &rl_intra_aic;
                 i = 0;
                 s->gb= gb;
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 5a8568c750..74ae89c260 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1446,7 +1446,7 @@ static uint8_t *decode_nal(H264Context *h, uint8_t *src, int *dst_length, int *c
 
     *dst_length= di;
     *consumed= si + 1;//+1 for the header
-//FIXME store exact number of bits in the getbitcontext (its needed for decoding)
+//FIXME store exact number of bits in the getbitcontext (it is needed for decoding)
     return dst;
 }
 
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index 673935b5e6..913f4fd19d 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -34,7 +34,7 @@
 #include "mpegvideo.h"
 
 #define interlaced_dct interlaced_dct_is_a_bad_name
-#define mb_intra mb_intra_is_not_initalized_see_mb_type
+#define mb_intra mb_intra_is_not_initialized_see_mb_type
 
 #define LUMA_DC_BLOCK_INDEX   25
 #define CHROMA_DC_BLOCK_INDEX 26
diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c
index 0d0bb5f311..ac91db213d 100644
--- a/libavcodec/huffyuv.c
+++ b/libavcodec/huffyuv.c
@@ -1169,7 +1169,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8
                 decode_bgr_bitstream(s, width-1);
                 add_left_prediction_bgr32(p->data[0] + last_line+4, s->temp[0], width-1, &leftr, &leftg, &leftb);
 
-                for(y=s->height-2; y>=0; y--){ //yes its stored upside down
+                for(y=s->height-2; y>=0; y--){ //Yes it is stored upside down.
                     decode_bgr_bitstream(s, width);
 
                     add_left_prediction_bgr32(p->data[0] + p->linesize[0]*y, s->temp[0], width, &leftr, &leftg, &leftb);
diff --git a/libavcodec/i386/idct_mmx.c b/libavcodec/i386/idct_mmx.c
index b3a5267f42..1a692f57bd 100644
--- a/libavcodec/i386/idct_mmx.c
+++ b/libavcodec/i386/idct_mmx.c
@@ -33,7 +33,7 @@
 #define rounder(bias) {round (bias), round (bias)}
 
 #if 0
-/* C row IDCT - its just here to document the MMXEXT and MMX versions */
+/* C row IDCT - it is just here to document the MMXEXT and MMX versions */
 static inline void idct_row (int16_t * row, int offset,
                              int16_t * table, int32_t * rounder)
 {
@@ -313,7 +313,7 @@ static inline void mmx_row_mid (int16_t * row, int store,
 
 
 #if 0
-// C column IDCT - its just here to document the MMXEXT and MMX versions
+// C column IDCT - it is just here to document the MMXEXT and MMX versions
 static inline void idct_col (int16_t * col, int offset)
 {
 /* multiplication - as implemented on mmx */
diff --git a/libavcodec/i386/mpegvideo_mmx_template.c b/libavcodec/i386/mpegvideo_mmx_template.c
index b8f1ee39dc..9c9c763b21 100644
--- a/libavcodec/i386/mpegvideo_mmx_template.c
+++ b/libavcodec/i386/mpegvideo_mmx_template.c
@@ -96,7 +96,7 @@ static int RENAME(dct_quantize)(MpegEncContext *s,
                             int qscale, int *overflow)
 {
     long last_non_zero_p1;
-    int level=0, q; //=0 is cuz gcc says uninitalized ...
+    int level=0, q; //=0 is cuz gcc says uninitialized ...
     const uint16_t *qmat, *bias;
     DECLARE_ALIGNED_16(int16_t, temp_block[64]);
 
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c
index 9d1c26fe23..014e3c5f44 100644
--- a/libavcodec/motion_est.c
+++ b/libavcodec/motion_est.c
@@ -1807,7 +1807,7 @@ static inline int direct_search(MpegEncContext * s, int mb_x, int mb_y)
     P_LEFT[1]        = av_clip(mv_table[mot_xy - 1][1], ymin<<shift, ymax<<shift);
 
     /* special case for first line */
-    if (!s->first_slice_line) { //FIXME maybe allow this over thread boundary as its clipped
+    if (!s->first_slice_line) { //FIXME maybe allow this over thread boundary as it is clipped
         P_TOP[0]      = av_clip(mv_table[mot_xy - mot_stride             ][0], xmin<<shift, xmax<<shift);
         P_TOP[1]      = av_clip(mv_table[mot_xy - mot_stride             ][1], ymin<<shift, ymax<<shift);
         P_TOPRIGHT[0] = av_clip(mv_table[mot_xy - mot_stride + 1         ][0], xmin<<shift, xmax<<shift);
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 477f387dd5..102cf7c252 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -3205,7 +3205,7 @@ static int mpeg_decode_frame(AVCodecContext *avctx,
                         return -1;
                     }
                 if(!s2->current_picture_ptr){
-                    av_log(avctx, AV_LOG_ERROR, "current_picture not initalized\n");
+                    av_log(avctx, AV_LOG_ERROR, "current_picture not initialized\n");
                     return -1;
                 }
 
diff --git a/libavcodec/mpeg4data.h b/libavcodec/mpeg4data.h
index e199c6a149..e79216b6d9 100644
--- a/libavcodec/mpeg4data.h
+++ b/libavcodec/mpeg4data.h
@@ -145,7 +145,8 @@ static RLTable rl_intra = {
     intra_level,
 };
 
-static const uint16_t inter_rvlc[170][2]={ //note this is identical to the intra rvlc except that its reordered
+/* Note this is identical to the intra rvlc except that it is reordered. */
+static const uint16_t inter_rvlc[170][2]={
 {0x0006,  3},{0x0001,  4},{0x0004,  5},{0x001C,  7},
 {0x003C,  8},{0x003D,  8},{0x007C,  9},{0x00FC, 10},
 {0x00FD, 10},{0x01FC, 11},{0x01FD, 11},{0x03FC, 12},
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 97ac828371..cef6013f61 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -441,11 +441,12 @@ static int alloc_picture(MpegEncContext *s, Picture *pic, int shared){
         CHECKED_ALLOCZ(pic->pan_scan , 1 * sizeof(AVPanScan))
     }
 
-    //it might be nicer if the application would keep track of these but it would require a API change
+    /* It might be nicer if the application would keep track of these
+     * but it would require an API change. */
     memmove(s->prev_pict_types+1, s->prev_pict_types, PREV_PICT_TYPES_BUFFER_SIZE-1);
     s->prev_pict_types[0]= s->pict_type;
     if(pic->age < PREV_PICT_TYPES_BUFFER_SIZE && s->prev_pict_types[pic->age] == B_TYPE)
-        pic->age= INT_MAX; // skipped MBs in b frames are quite rare in mpeg1/2 and its a bit tricky to skip them anyway
+        pic->age= INT_MAX; // Skipped MBs in B-frames are quite rare in MPEG-1/2 and it is a bit tricky to skip them anyway.
 
     return 0;
 fail: //for the CHECKED_ALLOCZ macro
diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c
index 109745426e..ca17ae5c4e 100644
--- a/libavcodec/msmpeg4.c
+++ b/libavcodec/msmpeg4.c
@@ -88,7 +88,7 @@ int frame_count = 0;
 #include "msmpeg4data.h"
 #include "msmpeg4tab.h"
 
-#ifdef CONFIG_ENCODERS //strangely gcc includes this even if its not references
+#ifdef CONFIG_ENCODERS //strangely gcc includes this even if it is not references
 static uint8_t rl_length[NB_RL_TABLES][MAX_LEVEL+1][MAX_RUN+1][2];
 #endif //CONFIG_ENCODERS
 
@@ -454,7 +454,7 @@ static void msmpeg4_encode_motion(MpegEncContext * s,
              mv->table_mv_bits[code],
              mv->table_mv_code[code]);
     if (code == mv->n) {
-        /* escape : code litterally */
+        /* escape : code literally */
         put_bits(&s->pb, 6, mx);
         put_bits(&s->pb, 6, my);
     }
@@ -983,7 +983,8 @@ static VLC v1_intra_cbpc_vlc;
 static VLC v1_inter_cbpc_vlc;
 static VLC inter_intra_vlc;
 
-/* this table is practically identical to the one from h263 except that its inverted */
+/* This table is practically identical to the one from h263
+ * except that it is inverted. */
 static void init_h263_dc_for_msmpeg4(void)
 {
         int level, uni_code, uni_len;
@@ -1380,7 +1381,7 @@ static void msmpeg4v2_encode_motion(MpegEncContext * s, int val)
 }
 #endif
 
-/* this is identical to h263 except that its range is multiplied by 2 */
+/* This is identical to h263 except that its range is multiplied by 2. */
 static int msmpeg4v2_decode_motion(MpegEncContext * s, int pred, int f_code)
 {
     int code, val, sign, shift;
diff --git a/libavcodec/resample2.c b/libavcodec/resample2.c
index f3d02169f5..c03c38c5c2 100644
--- a/libavcodec/resample2.c
+++ b/libavcodec/resample2.c
@@ -177,8 +177,8 @@ void av_build_filter(FELEM *filter, double factor, int tap_count, int phase_coun
 }
 
 /**
- * initalizes a audio resampler.
- * note, if either rate is not a integer then simply scale both rates up so they are
+ * Initializes an audio resampler.
+ * Note, if either rate is not an integer then simply scale both rates up so they are.
  */
 AVResampleContext *av_resample_init(int out_rate, int in_rate, int filter_size, int phase_shift, int linear, double cutoff){
     AVResampleContext *c= av_mallocz(sizeof(AVResampleContext));