# HG changeset patch
# User vitor
# Date 1196547664 0
# Node ID 80103098c797b16828aa1486bc33d1e746f73f66
# Parent  a6c9aa23d379db1b53a127cdd73c5e18dae037d6
spelling

diff -r a6c9aa23d379 -r 80103098c797 alac.c
--- a/alac.c	Sat Dec 01 15:41:35 2007 +0000
+++ b/alac.c	Sat Dec 01 22:21:04 2007 +0000
@@ -325,15 +325,15 @@
 
 #if 0
     /* 4 and 8 are very common cases (the only ones i've seen). these
-     * should be unrolled and optimised
+     * should be unrolled and optimized
      */
     if (predictor_coef_num == 4) {
-        /* FIXME: optimised general case */
+        /* FIXME: optimized general case */
         return;
     }
 
     if (predictor_coef_table == 8) {
-        /* FIXME: optimised general case */
+        /* FIXME: optimized general case */
         return;
     }
 #endif
diff -r a6c9aa23d379 -r 80103098c797 apedec.c
--- a/apedec.c	Sat Dec 01 15:41:35 2007 +0000
+++ b/apedec.c	Sat Dec 01 22:21:04 2007 +0000
@@ -490,7 +490,7 @@
     /* Keep a count of the blocks decoded in this frame */
     ctx->blocksdecoded = 0;
 
-    /* Initialise the rice structs */
+    /* Initialize the rice structs */
     ctx->riceX.k = 10;
     ctx->riceX.ksum = (1 << ctx->riceX.k) * 16;
     ctx->riceY.k = 10;
@@ -514,7 +514,7 @@
     memset(p->historybuffer, 0, PREDICTOR_SIZE * sizeof(int32_t));
     p->buf = p->historybuffer;
 
-    /* Initialise and zero the co-efficients */
+    /* Initialize and zero the co-efficients */
     memcpy(p->coeffsA[0], initial_coeffs, sizeof(initial_coeffs));
     memcpy(p->coeffsA[1], initial_coeffs, sizeof(initial_coeffs));
     memset(p->coeffsB, 0, sizeof(p->coeffsB));
diff -r a6c9aa23d379 -r 80103098c797 armv4l/mpegvideo_arm.c
--- a/armv4l/mpegvideo_arm.c	Sat Dec 01 15:41:35 2007 +0000
+++ b/armv4l/mpegvideo_arm.c	Sat Dec 01 22:21:04 2007 +0000
@@ -28,7 +28,7 @@
 void MPV_common_init_armv4l(MpegEncContext *s)
 {
     /* IWMMXT support is a superset of armv5te, so
-     * allow optimised functions for armv5te unless
+     * allow optimized functions for armv5te unless
      * a better iwmmxt function exists
      */
 #ifdef HAVE_ARMV5TE
diff -r a6c9aa23d379 -r 80103098c797 h263dec.c
--- a/h263dec.c	Sat Dec 01 15:41:35 2007 +0000
+++ b/h263dec.c	Sat Dec 01 22:21:04 2007 +0000
@@ -702,7 +702,7 @@
     }
 
     /* Return the Picture timestamp as the frame number */
-    /* we substract 1 because it is added on utils.c    */
+    /* we subtract 1 because it is added on utils.c     */
     avctx->frame_number = s->picture_number - 1;
 
 #ifdef PRINT_FRAME_TIME
diff -r a6c9aa23d379 -r 80103098c797 h264.c
--- a/h264.c	Sat Dec 01 15:41:35 2007 +0000
+++ b/h264.c	Sat Dec 01 22:21:04 2007 +0000
@@ -7850,7 +7850,7 @@
 #if 0 //?
 
     /* Return the Picture timestamp as the frame number */
-    /* we substract 1 because it is added on utils.c    */
+    /* we subtract 1 because it is added on utils.c     */
     avctx->frame_number = s->picture_number - 1;
 #endif
     return get_consumed_bytes(s, buf_index, buf_size);
diff -r a6c9aa23d379 -r 80103098c797 i386/cavsdsp_mmx.c
--- a/i386/cavsdsp_mmx.c	Sat Dec 01 15:41:35 2007 +0000
+++ b/i386/cavsdsp_mmx.c	Sat Dec 01 22:21:04 2007 +0000
@@ -2,7 +2,7 @@
  * Chinese AVS video (AVS1-P2, JiZhun profile) decoder.
  * Copyright (c) 2006  Stefan Gehrer <stefan.gehrer@gmx.de>
  *
- * MMX optimised DSP functions, based on H.264 optimisations by
+ * MMX optimized DSP functions, based on H.264 optimizations by
  * Michael Niedermayer and Loren Merritt
  *
  * This file is part of FFmpeg.
diff -r a6c9aa23d379 -r 80103098c797 i386/dsputil_mmx.c
--- a/i386/dsputil_mmx.c	Sat Dec 01 15:41:35 2007 +0000
+++ b/i386/dsputil_mmx.c	Sat Dec 01 22:21:04 2007 +0000
@@ -787,7 +787,7 @@
       "movq (%1,%3),%%mm4\n"    /* mm4 = pix2[1][0-7] */
 
       /* todo: mm1-mm2, mm3-mm4 */
-      /* algo: substract mm1 from mm2 with saturation and vice versa */
+      /* algo: subtract mm1 from mm2 with saturation and vice versa */
       /*       OR the results to get absolute difference */
       "movq %%mm1,%%mm5\n"
       "movq %%mm3,%%mm6\n"
@@ -847,7 +847,7 @@
       "movq 8(%1),%%mm4\n"      /* mm4 = pix2[8-15] */
 
       /* todo: mm1-mm2, mm3-mm4 */
-      /* algo: substract mm1 from mm2 with saturation and vice versa */
+      /* algo: subtract mm1 from mm2 with saturation and vice versa */
       /*       OR the results to get absolute difference */
       "movq %%mm1,%%mm5\n"
       "movq %%mm3,%%mm6\n"
@@ -907,7 +907,7 @@
       "movdqu (%1,%4),%%xmm4\n" /* mm4 = pix2[1][0-15] */
 
       /* todo: mm1-mm2, mm3-mm4 */
-      /* algo: substract mm1 from mm2 with saturation and vice versa */
+      /* algo: subtract mm1 from mm2 with saturation and vice versa */
       /*       OR the results to get absolute difference */
       "movdqa %%xmm1,%%xmm5\n"
       "movdqa %%xmm3,%%xmm6\n"
diff -r a6c9aa23d379 -r 80103098c797 i386/idct_mmx.c
--- a/i386/idct_mmx.c	Sat Dec 01 15:41:35 2007 +0000
+++ b/i386/idct_mmx.c	Sat Dec 01 22:21:04 2007 +0000
@@ -397,7 +397,7 @@
     static const short _T3[] ATTR_ALIGN(8) = {T3,T3,T3,T3};
     static const short _C4[] ATTR_ALIGN(8) = {C4,C4,C4,C4};
 
-    /* column code adapted from peter gubanov */
+    /* column code adapted from Peter Gubanov */
     /* http://www.elecard.com/peter/idct.shtml */
 
     movq_m2r (*_T1, mm0);               // mm0 = T1
diff -r a6c9aa23d379 -r 80103098c797 i386/mpegvideo_mmx.c
--- a/i386/mpegvideo_mmx.c	Sat Dec 01 15:41:35 2007 +0000
+++ b/i386/mpegvideo_mmx.c	Sat Dec 01 22:21:04 2007 +0000
@@ -177,7 +177,7 @@
                 if (level < -2048 || level > 2047)
                     fprintf(stderr, "unquant error %d %d\n", i, level);
 #endif
-  We can suppose that result of two multiplications can't be greate of 0xFFFF
+  We can suppose that result of two multiplications can't be greater than 0xFFFF
   i.e. is 16-bit, so we use here only PMULLW instruction and can avoid
   a complex multiplication.
 =====================================================
diff -r a6c9aa23d379 -r 80103098c797 imgconvert.c
--- a/imgconvert.c	Sat Dec 01 15:41:35 2007 +0000
+++ b/imgconvert.c	Sat Dec 01 22:21:04 2007 +0000
@@ -1935,7 +1935,7 @@
 
    - PIX_FMT_422 must convert to and from PIX_FMT_422P.
 
-   The other conversion functions are just optimisations for common cases.
+   The other conversion functions are just optimizations for common cases.
 */
 static const ConvertEntry convert_table[PIX_FMT_NB][PIX_FMT_NB] = {
     [PIX_FMT_YUV420P] = {
diff -r a6c9aa23d379 -r 80103098c797 imgconvert_template.h
--- a/imgconvert_template.h	Sat Dec 01 15:41:35 2007 +0000
+++ b/imgconvert_template.h	Sat Dec 01 22:21:04 2007 +0000
@@ -414,7 +414,7 @@
     }
 }
 
-// RGB24 has optimised routines
+// RGB24 has optimized routines
 #if !defined(FMT_RGB32) && !defined(FMT_RGB24)
 /* alpha support */
 
diff -r a6c9aa23d379 -r 80103098c797 imgresample.c
--- a/imgresample.c	Sat Dec 01 15:41:35 2007 +0000
+++ b/imgresample.c	Sat Dec 01 22:21:04 2007 +0000
@@ -285,7 +285,7 @@
 }
 #endif /* HAVE_MMX */
 
-/* slow version to handle limit cases. Does not need optimisation */
+/* slow version to handle limit cases. Does not need optimization */
 static void h_resample_slow(uint8_t *dst, int dst_width,
                             const uint8_t *src, int src_width,
                             int src_start, int src_incr, int16_t *filters)
diff -r a6c9aa23d379 -r 80103098c797 motion-test.c
--- a/motion-test.c	Sat Dec 01 15:41:35 2007 +0000
+++ b/motion-test.c	Sat Dec 01 22:21:04 2007 +0000
@@ -112,7 +112,7 @@
         }
     }
     emms_c();
-    dummy = d1; /* avoid optimisation */
+    dummy = d1; /* avoid optimization */
     ti = gettime() - ti;
 
     printf("  %0.0f kop/s\n",
diff -r a6c9aa23d379 -r 80103098c797 mpegvideo.h
--- a/mpegvideo.h	Sat Dec 01 15:41:35 2007 +0000
+++ b/mpegvideo.h	Sat Dec 01 22:21:04 2007 +0000
@@ -94,7 +94,7 @@
     uint8_t permutated[64];
     uint8_t raster_end[64];
 #ifdef ARCH_POWERPC
-                /** Used by dct_quantise_alitvec to find last-non-zero */
+                /** Used by dct_quantize_alitvec to find last-non-zero */
     DECLARE_ALIGNED_8(uint8_t, inverse[64]);
 #endif
 } ScanTable;
diff -r a6c9aa23d379 -r 80103098c797 ppc/dsputil_altivec.c
--- a/ppc/dsputil_altivec.c	Sat Dec 01 15:41:35 2007 +0000
+++ b/ppc/dsputil_altivec.c	Sat Dec 01 22:21:04 2007 +0000
@@ -1094,7 +1094,7 @@
       dstV =                                                            \
         (vector signed short)vec_mergeh((vector signed char)vzero,      \
         (vector signed char)dstO);                                      \
-      /* substractions inside the first butterfly */                    \
+      /* subtractions inside the first butterfly */                    \
       but0 = vec_sub(srcV, dstV);                                       \
       op1 = vec_perm(but0, but0, perm1);                                \
       but1 = vec_mladd(but0, vprod1, op1);                              \
@@ -1175,7 +1175,7 @@
   schedule for the 7450, and its code isn't much faster than
   gcc-3.3 on the 7450 (but uses 25% less instructions...)
 
-  On the 970, the hand-made RA is still a win (arount 690
+  On the 970, the hand-made RA is still a win (around 690
   vs. around 780), but xlc goes to around 660 on the
   regular C code...
 */
@@ -1267,7 +1267,7 @@
       dstW =                                                            \
         (vector signed short)vec_mergel((vector signed char)vzero,      \
         (vector signed char)dstO);                                      \
-      /* substractions inside the first butterfly */                    \
+      /* subtractions inside the first butterfly */                    \
       but0 = vec_sub(srcV, dstV);                                       \
       but0S = vec_sub(srcW, dstW);                                      \
       op1 = vec_perm(but0, but0, perm1);                                \
diff -r a6c9aa23d379 -r 80103098c797 ppc/gmc_altivec.c
--- a/ppc/gmc_altivec.c	Sat Dec 01 15:41:35 2007 +0000
+++ b/ppc/gmc_altivec.c	Sat Dec 01 22:21:04 2007 +0000
@@ -29,7 +29,7 @@
 
 /*
   altivec-enhanced gmc1. ATM this code assume stride is a multiple of 8,
-  to preserve proper dst alignement.
+  to preserve proper dst alignment.
 */
 #define GMC1_PERF_COND (h==8)
 void gmc1_altivec(uint8_t *dst /* align 8 */, uint8_t *src /* align1 */, int stride, int h, int x16, int y16, int rounder)
diff -r a6c9aa23d379 -r 80103098c797 ppc/mpegvideo_altivec.c
--- a/ppc/mpegvideo_altivec.c	Sat Dec 01 15:41:35 2007 +0000
+++ b/ppc/mpegvideo_altivec.c	Sat Dec 01 22:21:04 2007 +0000
@@ -80,7 +80,7 @@
     vector float row0, row1, row2, row3, row4, row5, row6, row7;
     vector float alt0, alt1, alt2, alt3, alt4, alt5, alt6, alt7;
     const vector float zero = (const vector float)FOUROF(0.);
-    // used after quantise step
+    // used after quantize step
     int oldBaseValue = 0;
 
     // Load the data into the row/alt vectors
@@ -258,7 +258,7 @@
         }
     }
 
-    // perform the quantise step, using the floating point data
+    // perform the quantize step, using the floating point data
     // still in the row/alt registers
     {
         const int* biasAddr;
@@ -474,7 +474,7 @@
         data[0] = (oldBaseValue + 4) >> 3;
     }
 
-    // We handled the tranpose permutation above and we don't
+    // We handled the transpose permutation above and we don't
     // need to permute the "no" permutation case.
     if ((lastNonZero > 0) &&
         (s->dsp.idct_permutation_type != FF_TRANSPOSE_IDCT_PERM) &&
diff -r a6c9aa23d379 -r 80103098c797 sparc/dsputil_vis.c
--- a/sparc/dsputil_vis.c	Sat Dec 01 15:41:35 2007 +0000
+++ b/sparc/dsputil_vis.c	Sat Dec 01 22:21:04 2007 +0000
@@ -3999,7 +3999,7 @@
 /* libavcodec initialization code */
 void dsputil_init_vis(DSPContext* c, AVCodecContext *avctx)
 {
-  /* VIS specific optimisations */
+  /* VIS specific optimizations */
   int accel = vis_level ();
 
   if (accel & ACCEL_SPARC_VIS) {
diff -r a6c9aa23d379 -r 80103098c797 vc1.c
--- a/vc1.c	Sat Dec 01 15:41:35 2007 +0000
+++ b/vc1.c	Sat Dec 01 22:21:04 2007 +0000
@@ -4102,7 +4102,7 @@
     }
 
     /* Return the Picture timestamp as the frame number */
-    /* we substract 1 because it is added on utils.c    */
+    /* we subtract 1 because it is added on utils.c    */
     avctx->frame_number = s->picture_number - 1;
 
     av_free(buf2);