Mercurial > libavcodec.hg

changeset 1466:618b148f6b76 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change pixel identifier conflict with AltiVec headers (patch courtesy of Magnus Damm <damm at opensource.se>)
author tmmm
date Sun, 14 Sep 2003 16:11:01 +0000
parents 52254c2f9cae
children a320fe172086
files xan.c
diffstat 1 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/xan.c	Sat Sep 13 10:07:46 2003 +0000
+++ b/xan.c	Sun Sep 14 16:11:01 2003 +0000
@@ -346,7 +346,7 @@
     int index;
     int current_x;
     int width = s->avctx->width;
-    unsigned char pixel;
+    unsigned char pix;
     unsigned char *palette_plane;
     unsigned char *y_plane;
     unsigned char *u_plane;
@@ -409,11 +409,11 @@
         index = y * stride + x * 3;
         current_x = x;
         while(pixel_count--) {
-            pixel = *pixel_buffer++;
+            pix = *pixel_buffer++;
 
-            rgb_plane[index++] = s->palette[pixel * 4 + 0];
-            rgb_plane[index++] = s->palette[pixel * 4 + 1];
-            rgb_plane[index++] = s->palette[pixel * 4 + 2];
+            rgb_plane[index++] = s->palette[pix * 4 + 0];
+            rgb_plane[index++] = s->palette[pix * 4 + 1];
+            rgb_plane[index++] = s->palette[pix * 4 + 2];
 
             current_x++;
             if (current_x >= width) {
@@ -453,11 +453,11 @@
         index = y * stride + x;
         current_x = x;
         while(pixel_count--) {
-            pixel = *pixel_buffer++;
+            pix = *pixel_buffer++;
 
-            y_plane[index] = s->palette[pixel * 4 + 0];
-            u_plane[index] = s->palette[pixel * 4 + 1];
-            v_plane[index] = s->palette[pixel * 4 + 2];
+            y_plane[index] = s->palette[pix * 4 + 0];
+            u_plane[index] = s->palette[pix * 4 + 1];
+            v_plane[index] = s->palette[pix * 4 + 2];
 
             index++;
             current_x++;