From 1f15a044d3f68d0311c010b5eb13f78261b4b365 Mon Sep 17 00:00:00 2001 From: Mark Olsen Date: Sat, 4 Mar 2006 16:50:55 +0000 Subject: [PATCH] Renamed pixel to _pixel to avoid clashes on archs where pixel is a builtin (Altivec) git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2044 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/m_mp3.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/engine/client/m_mp3.c b/engine/client/m_mp3.c index 60758abf..4681343a 100644 --- a/engine/client/m_mp3.c +++ b/engine/client/m_mp3.c @@ -1113,7 +1113,7 @@ qboolean Media_ShowFilm(void) unsigned char *pa=roqfilm->y[0]; unsigned char *pb=roqfilm->u[0]; unsigned char *pc=roqfilm->v[0]; - int pixel=0; + int _pixel=0; int num_columns=(roqfilm->width)>>1; int y; int x; @@ -1141,19 +1141,19 @@ qboolean Media_ShowFilm(void) b = 116130 * u; t=r+y1; - framedata[pixel] =(unsigned char) LIMIT(t); + framedata[_pixel] =(unsigned char) LIMIT(t); t=g+y1; - framedata[pixel+1] =(unsigned char) LIMIT(t); + framedata[_pixel+1] =(unsigned char) LIMIT(t); t=b+y1; - framedata[pixel+2] =(unsigned char) LIMIT(t); + framedata[_pixel+2] =(unsigned char) LIMIT(t); t=r+y2; - framedata[pixel+4] =(unsigned char) LIMIT(t); + framedata[_pixel+4] =(unsigned char) LIMIT(t); t=g+y2; - framedata[pixel+5] =(unsigned char) LIMIT(t); + framedata[_pixel+5] =(unsigned char) LIMIT(t); t=b+y2; - framedata[pixel+6] =(unsigned char) LIMIT(t); - pixel+=8; + framedata[_pixel+6] =(unsigned char) LIMIT(t); + _pixel+=8; } if(y & 0x01) { pb += num_columns; pc += num_columns; }