[SCM] libav/experimental: change pixel identifier conflict with AltiVec headers (patch courtesy of Magnus Damm <damm at opensource.se>)

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit afb8d3f80d974eadeee7ceb7915e94417c316abb
Author: Mike Melanson <mike at multimedia.cx>
Date:   Sun Sep 14 16:11:01 2003 +0000

    change pixel identifier conflict with AltiVec headers (patch courtesy of
    Magnus Damm <damm at opensource.se>)
    
    Originally committed as revision 2272 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/xan.c b/libavcodec/xan.c
index e2e3e56..2c8375e 100644
--- a/libavcodec/xan.c
+++ b/libavcodec/xan.c
@@ -346,7 +346,7 @@ static void inline xan_wc3_output_pixel_run(XanContext *s,
     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 @@ static void inline xan_wc3_output_pixel_run(XanContext *s,
         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 @@ static void inline xan_wc3_output_pixel_run(XanContext *s,
         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++;

-- 
Libav/FFmpeg packaging