highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change pixel identifier conflict with AltiVec headers (patch courtesy of

Browse Source 
Magnus Damm <damm at opensource.se>)

Originally committed as revision 2272 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Mike Melanson 2003-09-14 16:11:01 +00:00
parent e9c6531704
commit afb8d3f80d
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/xan.c
View File

@ -346,7 +346,7 @@ static void inline xan_wc3_output_pixel_run(XanContext *s,
int index; int index;
int current_x; int current_x;
int width = s->avctx->width; int width = s->avctx->width;
unsigned char pixel; unsigned char pix;
unsigned char *palette_plane; unsigned char *palette_plane;
unsigned char *y_plane; unsigned char *y_plane;
unsigned char *u_plane; unsigned char *u_plane;
@ -409,11 +409,11 @@ static void inline xan_wc3_output_pixel_run(XanContext *s,
index = y * stride + x * 3; index = y * stride + x * 3;
current_x = x; current_x = x;
while(pixel_count--) { while(pixel_count--) {
pixel = *pixel_buffer++; pix = *pixel_buffer++;
rgb_plane[index++] = s->palette[pixel * 4 + 0]; rgb_plane[index++] = s->palette[pix * 4 + 0];
rgb_plane[index++] = s->palette[pixel * 4 + 1]; rgb_plane[index++] = s->palette[pix * 4 + 1];
rgb_plane[index++] = s->palette[pixel * 4 + 2]; rgb_plane[index++] = s->palette[pix * 4 + 2];
current_x++; current_x++;
if (current_x >= width) { if (current_x >= width) {
@ -453,11 +453,11 @@ static void inline xan_wc3_output_pixel_run(XanContext *s,
index = y * stride + x; index = y * stride + x;
current_x = x; current_x = x;
while(pixel_count--) { while(pixel_count--) {
pixel = *pixel_buffer++; pix = *pixel_buffer++;
y_plane[index] = s->palette[pixel * 4 + 0]; y_plane[index] = s->palette[pix * 4 + 0];
u_plane[index] = s->palette[pixel * 4 + 1]; u_plane[index] = s->palette[pix * 4 + 1];
v_plane[index] = s->palette[pixel * 4 + 2]; v_plane[index] = s->palette[pix * 4 + 2];
index++; index++;
current_x++; current_x++;