cosmetics (spelling)

git-svn-id: svn://svn.videolan.org/x264/trunk@563 df754926-b1dd-0310-bc7b-ec298dee348c

diff --git a/common/cabac.c b/common/cabac.c
index f7e2941bea7a9488ffa2b80a6e4ce633106b2931..f6957fdd9528e8f121a3e66c058ac104683f1c67 100644 (file)
--- a/common/cabac.c
+++ b/common/cabac.c
@@ -34,7 +34,7 @@ static const int x264_cabac_context_init_I[460][2] =
     {  2,  54 }, {  3, 74 },  { -28,127 }, { -23, 104 },
     { -6,  53 }, { -1, 54 },  {  7,  51 },
 
-    /* 11 - 23 unsused for I */
+    /* 11 - 23 unused for I */
     { 0, 0 },    { 0, 0 },    { 0, 0 },      { 0, 0 },
     { 0, 0 },    { 0, 0 },    { 0, 0 },      { 0, 0 },
     { 0, 0 },    { 0, 0 },    { 0, 0 },      { 0, 0 },

diff --git a/common/common.h b/common/common.h
index a3973420478fdd064e160bf368ead8798630cf11..93dfa8aeacad63ddda52da860f6ebfaf07a8f3ce 100644 (file)
--- a/common/common.h
+++ b/common/common.h
@@ -563,7 +563,7 @@ struct x264_t
 
     } stat;
 
-    /* CPU functions dependants */
+    /* CPU functions dependents */
     x264_predict_t      predict_16x16[4+3];
     x264_predict_t      predict_8x8c[4+3];
     x264_predict8x8_t   predict_8x8[9+3];

diff --git a/common/macroblock.c b/common/macroblock.c
index f087451452c604b06ab938ed38ebf18dee2a6943..9bb854a366bffa02d799523f3c9325692e49b7f4 100644 (file)
--- a/common/macroblock.c
+++ b/common/macroblock.c
@@ -299,7 +299,7 @@ static int x264_mb_predict_mv_direct16x16_temporal( x264_t *h )
         }
         else
         {
-            /* the colocated ref isn't in the current list0 */
+            /* the collocated ref isn't in the current list0 */
             /* FIXME: we might still be able to use direct_8x8 on some partitions */
             /* FIXME: with B-pyramid + extensive ref list reordering
              *   (not currently used), we would also have to check
@@ -848,7 +848,7 @@ int x264_macroblock_cache_init( x264_t *h )
             CHECKED_MALLOC( h->mb.mvr[i][j], 2 * i_mb_count * sizeof(int16_t) );
     }
 
-    /* init with not avaiable (for top right idx=7,15) */
+    /* init with not available (for top right idx=7,15) */
     memset( h->mb.cache.ref[0], -2, X264_SCAN8_SIZE * sizeof( int8_t ) );
     memset( h->mb.cache.ref[1], -2, X264_SCAN8_SIZE * sizeof( int8_t ) );
 

diff --git a/common/predict.c b/common/predict.c
index edd7e244fdaf6115d6228bff996b5fc86ffd9e14..a5e9955341c72bb8c3e5738f562cf38631cbd5e6 100644 (file)
--- a/common/predict.c
+++ b/common/predict.c
@@ -139,7 +139,7 @@ static void predict_16x16_p( uint8_t *src )
     int V = 0;
     int i00;
 
-    /* calcule H and V */
+    /* calculate H and V */
     for( i = 0; i <= 7; i++ )
     {
         H += ( i + 1 ) * ( src[ 8 + i - FDEC_STRIDE ] - src[6 -i -FDEC_STRIDE] );

diff --git a/common/quant.c b/common/quant.c
index e06c8a4af608e08c94b850cc2c24ad99c227081e..a039c2e6bc82e7676d105814dacffd6c15f453c5 100644 (file)
--- a/common/quant.c
+++ b/common/quant.c
@@ -204,7 +204,7 @@ void x264_quant_init( x264_t *h, int cpu, x264_quant_function_t *pf )
 
 #ifdef HAVE_MMXEXT
 
-    /* determine the biggest coeffient in all quant8_mf tables */
+    /* determine the biggest coefficient in all quant8_mf tables */
     for( i = 0; i < 2*6*8*8; i++ )
     {
         int q = h->quant8_mf[0][0][0][i];
@@ -212,7 +212,7 @@ void x264_quant_init( x264_t *h, int cpu, x264_quant_function_t *pf )
             maxQ8 = q;
     }
 
-    /* determine the biggest coeffient in all quant4_mf tables ( maxQ4 )
+    /* determine the biggest coefficient in all quant4_mf tables ( maxQ4 )
        and the biggest DC coefficient if all quant4_mf tables ( maxQdc ) */
     for( i = 0; i < 4*6*4*4; i++ )
     {

diff --git a/encoder/analyse.c b/encoder/analyse.c
index 2fecbe72c5365c031402eea045c6c479eebc0718..3e4715a9b2942b30b1762308f03883c3253ac129 100644 (file)
--- a/encoder/analyse.c
+++ b/encoder/analyse.c
@@ -308,7 +308,7 @@ static void predict_16x16_mode_available( unsigned int i_neighbour, int *mode, i
 {
     if( i_neighbour & MB_TOPLEFT )
     {
-        /* top and left avaible */
+        /* top and left available */
         *mode++ = I_PRED_16x16_V;
         *mode++ = I_PRED_16x16_H;
         *mode++ = I_PRED_16x16_DC;
@@ -331,7 +331,7 @@ static void predict_16x16_mode_available( unsigned int i_neighbour, int *mode, i
     }
     else
     {
-        /* none avaible */
+        /* none available */
         *mode = I_PRED_16x16_DC_128;
         *pi_count = 1;
     }
@@ -342,7 +342,7 @@ static void predict_8x8chroma_mode_available( unsigned int i_neighbour, int *mod
 {
     if( i_neighbour & MB_TOPLEFT )
     {
-        /* top and left avaible */
+        /* top and left available */
         *mode++ = I_PRED_CHROMA_V;
         *mode++ = I_PRED_CHROMA_H;
         *mode++ = I_PRED_CHROMA_DC;
@@ -365,7 +365,7 @@ static void predict_8x8chroma_mode_available( unsigned int i_neighbour, int *mod
     }
     else
     {
-        /* none avaible */
+        /* none available */
         *mode = I_PRED_CHROMA_DC_128;
         *pi_count = 1;
     }

diff --git a/encoder/encoder.c b/encoder/encoder.c
index b1907f22159dff60828f315dc0bf264f4b018828..c5a3db0f1570274e1280358e2200724d4d6da4b8 100644 (file)
--- a/encoder/encoder.c
+++ b/encoder/encoder.c
@@ -1006,7 +1006,7 @@ static int x264_slice_write( x264_t *h )
         x264_macroblock_analyse( h );
         TIMER_STOP( i_mtime_analyse );
 
-        /* encode this macrobock -> be careful it can change the mb type to P_SKIP if needed */
+        /* encode this macroblock -> be careful it can change the mb type to P_SKIP if needed */
         TIMER_START( i_mtime_encode );
         x264_macroblock_encode( h );
         TIMER_STOP( i_mtime_encode );
@@ -1297,7 +1297,7 @@ do_encode:
     }
 
     /* ------------------- Setup frame context ----------------------------- */
-    /* 5: Init data dependant of frame type */
+    /* 5: Init data dependent of frame type */
     TIMER_START( i_mtime_encode_frame );
     if( h->fenc->i_type == X264_TYPE_IDR )
     {

diff --git a/encoder/set.c b/encoder/set.c
index bf88670ba243af456b5b4d33782412426a647b59..5f9ea1a24b1657a870e652147696000f596e8ffc 100644 (file)
--- a/encoder/set.c
+++ b/encoder/set.c
@@ -301,7 +301,7 @@ void x264_sps_write( bs_t *s, x264_sps_t *sps )
             }
             else
             {
-                bs_write( s, 8, 255);   /* aspect_ratio_idc (extented) */
+                bs_write( s, 8, 255);   /* aspect_ratio_idc (extended) */
                 bs_write( s, 16, sps->vui.i_sar_width );
                 bs_write( s, 16, sps->vui.i_sar_height );
             }

diff --git a/encoder/slicetype_decision.c b/encoder/slicetype_decision.c
index cfbc7305cbe4ca402f422de1e7631fc0ac1dc702..8a1db9c9ebaac63f5710180f59e257c04ea034ab 100644 (file)
--- a/encoder/slicetype_decision.c
+++ b/encoder/slicetype_decision.c
@@ -233,7 +233,7 @@ lowres_intra_mb:
                 fenc->i_intra_mbs[b-p0]++;
             }
             if( p1 > p0+1 )
-                i_bcost = i_bcost * 9 / 8; // arbitray penalty for I-blocks in and after B-frames
+                i_bcost = i_bcost * 9 / 8; // arbitrary penalty for I-blocks in and after B-frames
         }
     }
 

diff --git a/x264.h b/x264.h
index 5874be69075427f4d237e3f930c4a4dff5a96a1d..fbcf931855b6bbaac31ba01e8097442c98291df4 100644 (file)
--- a/x264.h
+++ b/x264.h
@@ -251,7 +251,7 @@ typedef struct
         float       f_qblur;        /* temporally blur quants */
         float       f_complexity_blur; /* temporally blur complexity */
         x264_zone_t *zones;         /* ratecontrol overrides */
-        int         i_zones;        /* sumber of zone_t's */
+        int         i_zones;        /* number of zone_t's */
         char        *psz_zones;     /* alternate method of specifying zones */
     } rc;