Mercurial > libavcodec.hg

diff xsubdec.c @ 5982:1900b70712ab libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
colour --> color in variable names
author diego
date Mon, 03 Dec 2007 13:33:48 +0000
parents 80b481ec72a6
children dfdff1ca78a7
line wrap: on
line diff
--- a/xsubdec.c	Mon Dec 03 13:01:53 2007 +0000
+++ b/xsubdec.c	Mon Dec 03 13:33:48 2007 +0000
@@ -108,11 +108,11 @@
         for (x = 0; x < w; ) {
             int log2 = ff_log2_tab[show_bits(&gb, 8)];
             int run = get_bits(&gb, 14 - 4 * (log2 >> 1));
-            int colour = get_bits(&gb, 2);
+            int color = get_bits(&gb, 2);
             run = FFMIN(run, w - x);
             // run length 0 means till end of row
             if (!run) run = w - x;
-            memset(bitmap, colour, run);
+            memset(bitmap, color, run);
             bitmap += run;
             x += run;
         }