Removed explicit usage of the 'register' keyword.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

16 files changed, 68 insertions, 68 deletions

diff --git a/mpeglib/lib/decoder/tplayPlugin.cpp b/mpeglib/lib/decoder/tplayPlugin.cpp
index 01c44cbc..150b1ba2 100644
--- a/mpeglib/lib/decoder/tplayPlugin.cpp
+++ b/mpeglib/lib/decoder/tplayPlugin.cpp
@@ -169,7 +169,7 @@ void TplayPlugin::config(const char* key,const char* value,void* user_data) {
 
 
 void TplayPlugin::swap_block(char * buffer, int blocksize) {
-  register int i;
+  int i;
   char c, *p;
 
   p = buffer;
diff --git a/mpeglib/lib/mpegplay/jrevdct.cpp b/mpeglib/lib/mpegplay/jrevdct.cpp
index 4ffe48ab..5ca0050c 100644
--- a/mpeglib/lib/mpegplay/jrevdct.cpp
+++ b/mpeglib/lib/mpegplay/jrevdct.cpp
@@ -320,8 +320,8 @@ void init_pre_idct() {
 
 void j_rev_dct_sparse (DCTBLOCK data, int pos) {
   short int val;
-  register int *dp;
-  register int v;
+  int *dp;
+  int v;
   int quant;
 
   //  cout << "j_rev_dct_sparse"<<endl;
@@ -462,7 +462,7 @@ void j_rev_dct (DCTBLOCK data) {
   INT32 tmp10, tmp11, tmp12, tmp13;
   INT32 z1, z2, z3, z4, z5;
   INT32 d0, d1, d2, d3, d4, d5, d6, d7;
-  register DCTELEM *dataptr;
+  DCTELEM *dataptr;
   int rowctr;
   SHIFT_TEMPS
 
@@ -483,7 +483,7 @@ void j_rev_dct (DCTBLOCK data) {
      * row DCT calculations can be simplified this way.
      */
 
-    register int *idataptr = (int*)dataptr;
+    int *idataptr = (int*)dataptr;
     d0 = dataptr[0];
     d1 = dataptr[1];
     if ((d1 == 0) && (idataptr[1] + idataptr[2] + idataptr[3]) == 0) {
@@ -491,7 +491,7 @@ void j_rev_dct (DCTBLOCK data) {
       if (d0) {
 	  /* Compute a 32 bit value to assign. */
 	  DCTELEM dcval = (DCTELEM) (d0 << PASS1_BITS);
-	  register int v = (dcval & 0xffff) + (dcval << 16);
+	  int v = (dcval & 0xffff) + (dcval << 16);
 	  
 	  idataptr[0] = v;
 	  idataptr[1] = v;
@@ -1475,7 +1475,7 @@ void j_rev_dct (DCTBLOCK data)
   INT32 tmp0, tmp1, tmp2, tmp3;
   INT32 tmp10, tmp11, tmp12, tmp13;
   INT32 z1, z2, z3, z4, z5;
-  register DCTELEM *dataptr;
+  DCTELEM *dataptr;
   int rowctr;
   SHIFT_TEMPS
 
diff --git a/mpeglib/lib/splay/dct36_12.cpp b/mpeglib/lib/splay/dct36_12.cpp
index b9978d7d..7c82eb3a 100644
--- a/mpeglib/lib/splay/dct36_12.cpp
+++ b/mpeglib/lib/splay/dct36_12.cpp
@@ -185,7 +185,7 @@ inline void dct12(REAL *in,REAL *prevblk1,REAL *prevblk2,REAL *wi,REAL *out) {
 
   {
     REAL in0,in1,in2,in3,in4,in5;
-    register REAL *pb1=prevblk1;
+    REAL *pb1=prevblk1;
     out[SBLIMIT*0]=pb1[0];out[SBLIMIT*1]=pb1[1];out[SBLIMIT*2]=pb1[2];
     out[SBLIMIT*3]=pb1[3];out[SBLIMIT*4]=pb1[4];out[SBLIMIT*5]=pb1[5];
  
@@ -194,7 +194,7 @@ inline void dct12(REAL *in,REAL *prevblk1,REAL *prevblk2,REAL *wi,REAL *out) {
     {
       REAL tmp0,tmp1=(in0-in4);
       {
-	register REAL tmp2=(in1-in5)*hsec_12[1];
+	REAL tmp2=(in1-in5)*hsec_12[1];
 	tmp0=tmp1+tmp2;
 	tmp1-=tmp2;
       }
@@ -219,7 +219,7 @@ inline void dct12(REAL *in,REAL *prevblk1,REAL *prevblk2,REAL *wi,REAL *out) {
   in++;
   {
     REAL in0,in1,in2,in3,in4,in5;
-    register REAL *pb2 = prevblk2;
+    REAL *pb2 = prevblk2;
  
     DCT12_PART1;
 
@@ -252,7 +252,7 @@ inline void dct12(REAL *in,REAL *prevblk1,REAL *prevblk2,REAL *wi,REAL *out) {
   in++; 
   {
     REAL in0,in1,in2,in3,in4,in5;
-    register REAL *pb2 = prevblk2;
+    REAL *pb2 = prevblk2;
     pb2[12]=pb2[13]=pb2[14]=pb2[15]=pb2[16]=pb2[17]=0.0;
 
     DCT12_PART1;
diff --git a/mpeglib/lib/splay/dct64.cpp b/mpeglib/lib/splay/dct64.cpp
index 14241651..889a2229 100644
--- a/mpeglib/lib/splay/dct64.cpp
+++ b/mpeglib/lib/splay/dct64.cpp
@@ -67,7 +67,7 @@ inline void dct64(REAL* out1,REAL* out2,REAL *fraction) {
   // compute new values via a fast cosine transform:
   {
     // put to buffer 0..15
-    register REAL* x=fraction;
+    REAL* x=fraction;
 
     p0=x[ 0]+x[31];p1=x[ 1]+x[30];p2=x[ 2]+x[29];p3=x[ 3]+x[28];
     p4=x[ 4]+x[27];p5=x[ 5]+x[26];p6=x[ 6]+x[25];p7=x[ 7]+x[24];
@@ -102,7 +102,7 @@ inline void dct64(REAL* out1,REAL* out2,REAL *fraction) {
   pc=qc+qd;pd=hcos_4*(qc-qd);pe=qe+qf;pf=hcos_4*(qe-qf);
 
   {
-    register REAL tmp;
+    REAL tmp;
 
     tmp=p6+p7;
     OUT2(36)=-(p5+tmp);
@@ -128,7 +128,7 @@ inline void dct64(REAL* out1,REAL* out2,REAL *fraction) {
 
   {
     // put to buffer 16..31
-    register REAL *x=fraction;
+    REAL *x=fraction;
 
     p0=hcos_64[ 0]*(x[ 0]-x[31]);p1=hcos_64[ 1]*(x[ 1]-x[30]);
     p2=hcos_64[ 2]*(x[ 2]-x[29]);p3=hcos_64[ 3]*(x[ 3]-x[28]);
diff --git a/mpeglib/lib/splay/dct64_down.cpp b/mpeglib/lib/splay/dct64_down.cpp
index 7137664c..b6b0e90b 100644
--- a/mpeglib/lib/splay/dct64_down.cpp
+++ b/mpeglib/lib/splay/dct64_down.cpp
@@ -64,7 +64,7 @@ inline void dct64_downsample(REAL* out1,REAL* out2,REAL *fraction) {
 
   // compute new values via a fast cosine transform:
   /*  {
-    register REAL *x=fraction;
+    REAL *x=fraction;
 
     p0=x[ 0]+x[31];p1=x[ 1]+x[30];p2=x[ 2]+x[29];p3=x[ 3]+x[28];
     p4=x[ 4]+x[27];p5=x[ 5]+x[26];p6=x[ 6]+x[25];p7=x[ 7]+x[24];
@@ -81,7 +81,7 @@ inline void dct64_downsample(REAL* out1,REAL* out2,REAL *fraction) {
 
   {
 
-    register REAL *x=fraction;
+    REAL *x=fraction;
 
     q0=x[ 0]+x[15];q1=x[ 1]+x[14];q2=x[ 2]+x[13];q3=x[ 3]+x[12];
     q4=x[ 4]+x[11];q5=x[ 5]+x[10];q6=x[ 6]+x[ 9];q7=x[ 7]+x[ 8];
@@ -110,7 +110,7 @@ inline void dct64_downsample(REAL* out1,REAL* out2,REAL *fraction) {
   pc=qc+qd;pd=hcos_4_down*(qc-qd);pe=qe+qf;pf=hcos_4_down*(qe-qf);
 
   {
-    register REAL tmp;
+    REAL tmp;
 
     tmp=p6+p7;
     OUT2(36)=-(p5+tmp);
@@ -135,7 +135,7 @@ inline void dct64_downsample(REAL* out1,REAL* out2,REAL *fraction) {
   }
 
   {
-    register REAL *x=fraction;
+    REAL *x=fraction;
 
     /*    p0=hcos_64_down[ 0]*(x[ 0]-x[31]);p1=hcos_64_down[ 1]*(x[ 1]-x[30]);
     p2=hcos_64_down[ 2]*(x[ 2]-x[29]);p3=hcos_64_down[ 3]*(x[ 3]-x[28]);
diff --git a/mpeglib/lib/splay/huffmanlookup.cpp b/mpeglib/lib/splay/huffmanlookup.cpp
index cfce3c47..767dfb26 100644
--- a/mpeglib/lib/splay/huffmanlookup.cpp
+++ b/mpeglib/lib/splay/huffmanlookup.cpp
@@ -100,7 +100,7 @@ void HuffmanLookup::huffmandecoder_1(const HUFFMANCODETABLE *h, int *x, int *y)
     level>>=1;
     if(!(level || ((unsigned)point<Mpegtoraw::ht->treelen)))
     {
-      register int xx,yy;
+      int xx,yy;
 
       xx=(h->xlen<<1);// set x and y to a medium value as a simple concealment
       yy=(h->ylen<<1);
diff --git a/mpeglib/lib/splay/mpegAudioBitWindow.cpp b/mpeglib/lib/splay/mpegAudioBitWindow.cpp
index 5e63f1fc..b31be447 100644
--- a/mpeglib/lib/splay/mpegAudioBitWindow.cpp
+++ b/mpeglib/lib/splay/mpegAudioBitWindow.cpp
@@ -34,7 +34,7 @@ void MpegAudioBitWindow::wrap(void) {
   point&=(WINDOWSIZE-1);
 
   if(p>=point) {
-    for(register int i=4;i<point;i++)
+    for(int i=4;i<point;i++)
       buffer[WINDOWSIZE+i]=buffer[i];
   }
   *((int *)(buffer+WINDOWSIZE))=*((int *)buffer);
diff --git a/mpeglib/lib/splay/mpegAudioBitWindow.h b/mpeglib/lib/splay/mpegAudioBitWindow.h
index f7a2f64c..534ff9fe 100644
--- a/mpeglib/lib/splay/mpegAudioBitWindow.h
+++ b/mpeglib/lib/splay/mpegAudioBitWindow.h
@@ -99,15 +99,15 @@ class MpegAudioBitWindow {
 
 
   int getbit(void) {
-    register int r=(buffer[(bitindex>>3)&(WINDOWSIZE-1)]>>(7-(bitindex&7)))&1;
-    //register int r=(buffer[bitindex>>3]>>(7-(bitindex&7)))&1;
+    int r=(buffer[(bitindex>>3)&(WINDOWSIZE-1)]>>(7-(bitindex&7)))&1;
+    //int r=(buffer[bitindex>>3]>>(7-(bitindex&7)))&1;
     bitindex++;
     return r;
   }
 
   // no range check version
   inline int getbits9_f(int bits) {
-    register unsigned short a;
+    unsigned short a;
     {
       int offset=bitindex>>3;
       a=(((unsigned char)buffer[offset])<<8)|((unsigned char)buffer[offset+1]);
@@ -119,7 +119,7 @@ class MpegAudioBitWindow {
 
   // range check version
   int getbits9(int bits) {
-    register unsigned short a;
+    unsigned short a;
     {
       int offset=(bitindex>>3)&(WINDOWSIZE-1);
       a=(((unsigned char)buffer[offset])<<8)|((unsigned char)buffer[offset+1]);
diff --git a/mpeglib/lib/splay/mpegAudioStream.h b/mpeglib/lib/splay/mpegAudioStream.h
index 9e4accc3..dba02379 100644
--- a/mpeglib/lib/splay/mpegAudioStream.h
+++ b/mpeglib/lib/splay/mpegAudioStream.h
@@ -59,7 +59,7 @@ class MpegAudioStream {
   }
 
   inline int getbits9(int bits) {
-    register unsigned short a;
+    unsigned short a;
     {
       int offset=bitindex>>3;
       
@@ -73,7 +73,7 @@ class MpegAudioStream {
   }
 
   inline int getbits8() {
-    register unsigned short a;
+    unsigned short a;
     
     {
       int offset=bitindex>>3;
@@ -88,7 +88,7 @@ class MpegAudioStream {
   }
 
   inline int getbit() {
-     register int r=(buffer[bitindex>>3]>>(7-(bitindex&7)))&1;
+     int r=(buffer[bitindex>>3]>>(7-(bitindex&7)))&1;
 
      bitindex++;
      return r;
diff --git a/mpeglib/lib/splay/mpeglayer1.cpp b/mpeglib/lib/splay/mpeglayer1.cpp
index a32951c4..2d939d9d 100644
--- a/mpeglib/lib/splay/mpeglayer1.cpp
+++ b/mpeglib/lib/splay/mpeglayer1.cpp
@@ -46,7 +46,7 @@ void Mpegtoraw::extractlayer1(void)
   int bitalloc[MAXCHANNEL][MAXSUBBAND],
       sample[MAXCHANNEL][MAXSUBBAND];
 
-  register int i,j;
+  int i,j;
   int s=stereobound,l;
 
 
diff --git a/mpeglib/lib/splay/mpeglayer2.cpp b/mpeglib/lib/splay/mpeglayer2.cpp
index 4012ff27..1b907a07 100644
--- a/mpeglib/lib/splay/mpeglayer2.cpp
+++ b/mpeglib/lib/splay/mpeglayer2.cpp
@@ -86,8 +86,8 @@ void Mpegtoraw::extractlayer2(void) {
 
   // Bitalloc
   {
-    register int i;
-    register const int *t=bitalloclengthtable[tableindex];
+    int i;
+    const int *t=bitalloclengthtable[tableindex];
     for(i=0;i<s;i++,t++)
     {
       bitalloc[LS][i]=getbits(*t);
@@ -102,18 +102,18 @@ void Mpegtoraw::extractlayer2(void) {
 
   // Scale selector
   if(inputstereo)
-    for(register int i=0;i<n;i++)
+    for(int i=0;i<n;i++)
     {
       if(bitalloc[LS][i])scaleselector[LS][i]=getbits(2);
       if(bitalloc[RS][i])scaleselector[RS][i]=getbits(2);
     }
   else
-    for(register int i=0;i<n;i++)
+    for(int i=0;i<n;i++)
       if(bitalloc[LS][i])scaleselector[LS][i]=getbits(2);
 
   // Scale index
   {
-    register int i,j;
+    int i,j;
 
 
     for(i=0;i<n;i++)
@@ -271,7 +271,7 @@ void Mpegtoraw::extractlayer2(void) {
 
 // Read Sample
   {
-    register int i;
+    int i;
 
     for(int l=0;l<SCALEBLOCK;l++)
     {
@@ -282,7 +282,7 @@ void Mpegtoraw::extractlayer2(void) {
 	{
 	  if(group[LS][i])
 	  {
-	    register const REAL *s;
+	    const REAL *s;
 	    int code=getbits(codelength[LS][i]);
 
 
@@ -351,7 +351,7 @@ void Mpegtoraw::extractlayer2(void) {
 	{
 	  if(group[LS][i])
 	  {
-	    register const REAL *s;
+	    const REAL *s;
 	    int code=getbits(codelength[LS][i]);
 
 	    code+=code<<1;
@@ -396,7 +396,7 @@ void Mpegtoraw::extractlayer2(void) {
 	      fraction[LS][2][i]=(fraction[LS][2][i]+d[LS][i])*c[LS][i];
 	    }
 
-	    register REAL t=scalefactor[LS][l>>2][i];
+	    REAL t=scalefactor[LS][l>>2][i];
 	    fraction[LS][0][i]*=t;
 	    fraction[LS][1][i]*=t;
 	    fraction[LS][2][i]*=t;
@@ -411,7 +411,7 @@ void Mpegtoraw::extractlayer2(void) {
 	      fraction[RS][2][i]=(fraction[RS][2][i]+d[RS][i])*c[LS][i];
 	    }
 
-	    register REAL t=scalefactor[RS][l>>2][i];
+	    REAL t=scalefactor[RS][l>>2][i];
 	    fraction[RS][0][i]*=t;
 	    fraction[RS][1][i]*=t;
 	    fraction[RS][2][i]*=t;
@@ -428,7 +428,7 @@ void Mpegtoraw::extractlayer2(void) {
 	      fraction[LS][2][i]=(fraction[LS][2][i]+d[LS][i])*c[LS][i];
 	    }
 
-	    register REAL t=scalefactor[LS][l>>2][i];
+	    REAL t=scalefactor[LS][l>>2][i];
 	    fraction[LS][0][i]*=t;
 	    fraction[LS][1][i]*=t;
 	    fraction[LS][2][i]*=t;
diff --git a/mpeglib/lib/splay/mpeglayer3.cpp b/mpeglib/lib/splay/mpeglayer3.cpp
index eeb09697..3abed128 100644
--- a/mpeglib/lib/splay/mpeglayer3.cpp
+++ b/mpeglib/lib/splay/mpeglayer3.cpp
@@ -337,7 +337,7 @@ void Mpegtoraw::layer3getscalefactors(int ch,int gr)
 			  {0, 1, 2, 3, 0, 1, 2, 3, 1, 2, 3, 1, 2, 3, 2, 3}};
 
   layer3grinfo *gi=&(sideinfo.ch[ch].gr[gr]);
-  register layer3scalefactor *sf=(&scalefactors[ch]);
+  layer3scalefactor *sf=(&scalefactors[ch]);
   int l0,l1;
 
   {
@@ -479,7 +479,7 @@ void Mpegtoraw::layer3getscalefactors_2(int ch)
   int sb[54];
   int extendedmode=mpegAudioHeader->getExtendedmode();
   layer3grinfo *gi=&(sideinfo.ch[ch].gr[0]);
-  register layer3scalefactor *sf=(&scalefactors[ch]);
+  layer3scalefactor *sf=(&scalefactors[ch]);
 
   {
     int blocktypenumber,sc;
@@ -641,7 +641,7 @@ inline void Mpegtoraw::huffmandecoder_1(const HUFFMANCODETABLE *h,int *x,int *y)
     level>>=1;
     if(!(level || ((unsigned)point<ht->treelen)))
     {
-      register int xx,yy;
+      int xx,yy;
 
       xx=(h->xlen<<1);// set x and y to a medium value as a simple concealment
       yy=(h->ylen<<1);
@@ -670,7 +670,7 @@ inline void Mpegtoraw::huffmandecoder_2(const HUFFMANCODETABLE *h,
   {
     if(h->val[point][0]==0)
     {   /*end of tree*/
-      register int t=h->val[point][1];
+      int t=h->val[point][1];
 
       if(t&8)*v=1-(wgetbit()<<1); else *v=0;
       if(t&4)*w=1-(wgetbit()<<1); else *w=0;
@@ -754,7 +754,7 @@ void Mpegtoraw::layer3huffmandecode(int ch,int gr,int out[SBLIMIT][SSLIMIT])
   for(i=0;i<e;)
   {
     const HUFFMANCODETABLE *h;
-    register int end;
+    int end;
       
     if     (i<region1Start)
     {
@@ -890,10 +890,10 @@ void Mpegtoraw::layer3dequantizesample(int ch,int gr,
     {
       cb_width=(sfBandIndex->s[cb+1]-sfBandIndex->s[cb])>>1;
 
-      for(register int k=0;k<3;k++)
+      for(int k=0;k<3;k++)
       {
-	register REAL factor;
-	register int count=cb_width;
+	REAL factor;
+	int count=cb_width;
 	// maplay12 opt.
 	if(index+(count<<1) > arrayEnd) {
 	  if (index >= arrayEnd) break;
@@ -1328,7 +1328,7 @@ inline void Mpegtoraw::layer3fixtostereo(int gr,REAL in[2][SBLIMIT][SSLIMIT])
       do{
 	if(is_pos[i]==7)
 	{
-	  register REAL t=in[LS][0][i];
+	  REAL t=in[LS][0][i];
 	  in[LS][0][i]=(t+in[RS][0][i])*0.7071068f;
 	  in[RS][0][i]=(t-in[RS][0][i])*0.7071068f;
 	}
@@ -1358,7 +1358,7 @@ inline void Mpegtoraw::layer3fixtostereo(int gr,REAL in[2][SBLIMIT][SSLIMIT])
     {
       int i=maxArray-1;
       do{
-	register REAL t=in[LS][0][i];
+	REAL t=in[LS][0][i];
 
 	in[LS][0][i]=(t+in[RS][0][i])*0.7071068f;
 	in[RS][0][i]=(t-in[RS][0][i])*0.7071068f;
@@ -1488,7 +1488,7 @@ void Mpegtoraw::layer3reorderandantialias(int ch,int gr,
   int version=mpegAudioHeader->getVersion();
   int frequency=mpegAudioHeader->getFrequency();
   int mpeg25=mpegAudioHeader->getLayer25();
-  register layer3grinfo *gi=&(sideinfo.ch[ch].gr[gr]);
+  layer3grinfo *gi=&(sideinfo.ch[ch].gr[gr]);
 
   if(gi->generalflag) {
     if(gi->mixed_block_flag) {
@@ -1591,12 +1591,12 @@ void Mpegtoraw::extractlayer3(void) {
     }
     // read main data.
     if(issync()) {
-      for(register int i=layer3slots;i>0;i--) {
+      for(int i=layer3slots;i>0;i--) {
 	bitwindow.putbyte(getbyte());
       }
     } else {
       // read main data.
-      for(register int i=layer3slots;i>0;i--) {
+      for(int i=layer3slots;i>0;i--) {
 	bitwindow.putbyte(getbits8());
       }
     }
@@ -1681,13 +1681,13 @@ void Mpegtoraw::extractlayer3_2(void) {
     }
     // read main data.
     if(issync()) {
-      for(register int i=layer3slots;i>0;i--) {
+      for(int i=layer3slots;i>0;i--) {
 	bitwindow.putbyte(getbyte());
       }
     }
     else {
       // read main data.
-      for(register int i=layer3slots;i>0;i--) {
+      for(int i=layer3slots;i>0;i--) {
 	bitwindow.putbyte(getbits8());
       }
     }
diff --git a/mpeglib/lib/splay/synth_Down.cpp b/mpeglib/lib/splay/synth_Down.cpp
index fbe3887b..e5a2f2e0 100644
--- a/mpeglib/lib/splay/synth_Down.cpp
+++ b/mpeglib/lib/splay/synth_Down.cpp
@@ -39,8 +39,8 @@ void Synthesis::computebuffer_Down(REAL *fraction,
 inline void Synthesis::generatesingle_Down(void)
 {
   int i;
-  register REAL r, *vp;
-  register const REAL *dp;
+  REAL r, *vp;
+  const REAL *dp;
 
   i=32/2;
   dp=filter;
@@ -121,8 +121,8 @@ inline void Synthesis::generate_Down(void)
 {
   int i;
   REAL r1,r2;
-  register REAL *vp1,*vp2;
-  register const REAL *dp;
+  REAL *vp1,*vp2;
+  const REAL *dp;
 
   dp=filter;
   vp1=calcbuffer[LS][currentcalcbuffer]+calcbufferoffset;
diff --git a/mpeglib/lib/splay/synth_Std.cpp b/mpeglib/lib/splay/synth_Std.cpp
index 6ea1d027..121e1afb 100644
--- a/mpeglib/lib/splay/synth_Std.cpp
+++ b/mpeglib/lib/splay/synth_Std.cpp
@@ -39,8 +39,8 @@ inline void Synthesis::computebuffer_Std(REAL *fraction,
 
 inline void Synthesis::generatesingle_Std(void) {
   int i;
-  register REAL r, *vp;
-  register const REAL *dp;
+  REAL r, *vp;
+  const REAL *dp;
 
   i=32;
   dp=filter;
@@ -120,8 +120,8 @@ inline void Synthesis::generate_old(void)
 {
   int i;
   REAL r1,r2;
-  register REAL *vp1,*vp2;
-  register const REAL *dp;
+  REAL *vp1,*vp2;
+  const REAL *dp;
 
   dp=filter;
   vp1=calcbuffer[LS][currentcalcbuffer]+calcbufferoffset;
@@ -195,14 +195,14 @@ inline void Synthesis::generate_Std(void)
   int i;
   REAL r1,r2;
 
-  register REAL *vp1;
-  register const REAL *dp;
+  REAL *vp1;
+  const REAL *dp;
 
   dp=filter;
   vp1=calcbuffer[LS][currentcalcbuffer]+calcbufferoffset;
   // we calculate cp2 from vp1 because they are both
   // in the same array. code was:
-  // register REAL* vp2
+  // REAL* vp2
   //vp2=calcbuffer[RS][currentcalcbuffer]+calcbufferoffset;
 
   i=32;
diff --git a/mpeglib/lib/util/audio/audioIO_BeOS.cpp b/mpeglib/lib/util/audio/audioIO_BeOS.cpp
index ae4cf5a1..ff73cd57 100644
--- a/mpeglib/lib/util/audio/audioIO_BeOS.cpp
+++ b/mpeglib/lib/util/audio/audioIO_BeOS.cpp
@@ -126,7 +126,7 @@ int audioRead(char *buffer, int count)
 {
     //printf("acquiring ok_to_read (%d bytes)\n", count);
     if (acquire_sem(ok_to_read)==B_NO_ERROR) {
-		for (register int i=0; i < count;i++) {
+		for (int i=0; i < count;i++) {
            *(buffer++)+=*(readbase++);
     	}  
         bytes_in_streambuf-=count;
diff --git a/mpeglib/lib/util/render/dither/colorTable8Bit.cpp b/mpeglib/lib/util/render/dither/colorTable8Bit.cpp
index 57c533de..fa3aa84d 100644
--- a/mpeglib/lib/util/render/dither/colorTable8Bit.cpp
+++ b/mpeglib/lib/util/render/dither/colorTable8Bit.cpp
@@ -59,7 +59,7 @@ void ColorTable8Bit::init8BitColor() {
 
   
   for (i=0; i<CR_RANGE; i++) {
-    register double tmp;
+    double tmp;
     if (chromaCorrectFlag) {
       tmp = ((i * 256) / (CR_RANGE)) + (256/(CR_RANGE*2));
       Cr_r_tab[i]=(TABTYPE) ((0.419/0.299)*CHROMA_CORRECTION128D(tmp-128.0));
@@ -75,7 +75,7 @@ void ColorTable8Bit::init8BitColor() {
 
   
   for (i=0; i<CB_RANGE; i++) {
-    register double tmp;
+    double tmp;
     if (chromaCorrectFlag) {
       tmp = ((i * 256) / (CB_RANGE)) + (256/(CB_RANGE*2));
       Cb_g_tab[i]=(TABTYPE) (-(0.114/0.331)*CHROMA_CORRECTION128D(tmp-128.0));