From 6db8697910438fd063598f66a73b68d2dcd70a36 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 30 Jan 2020 20:17:37 +0900 Subject: Removed explicit usage of the 'register' keyword. Signed-off-by: Michele Calgaro --- mpeglib/lib/splay/mpeglayer3.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'mpeglib/lib/splay/mpeglayer3.cpp') 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)pointtreelen))) { - 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;is[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()); } } -- cgit v1.2.1