diff options
| author | Mike Melanson <mike@multimedia.cx> | 2003-09-14 16:11:01 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2003-09-14 16:11:01 +0000 |
| commit | afb8d3f80d974eadeee7ceb7915e94417c316abb (patch) | |
| tree | 552fc6126c58d0336a32e1d1f9c2af8c00731589 /libavcodec | |
| parent | e9c6531704f6a4d4f496a74c3094a2888d4f2f54 (diff) | |
| download | ffmpeg-afb8d3f80d974eadeee7ceb7915e94417c316abb.tar.gz | |
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
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/xan.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/xan.c b/libavcodec/xan.c index e2e3e56e41..2c8375eb66 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++; |