diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 18:25:34 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 18:25:34 +0300 |
| commit | 7795726e0f8c70edd6ecde7fd2137214af302f4f (patch) | |
| tree | 87a087e69a0e2912183736de409676f824fb2248 /mp3lib/layer2.c | |
| parent | ba3b65b92f3f822fa75b0210b841557f5b20f6d1 (diff) | |
| parent | e16f02fe4001f3056b8efd1a099a563569b73f5d (diff) | |
| download | mpv-7795726e0f8c70edd6ecde7fd2137214af302f4f.tar.bz2 mpv-7795726e0f8c70edd6ecde7fd2137214af302f4f.tar.xz | |
Merge svn changes up to r31033
Diffstat (limited to 'mp3lib/layer2.c')
| -rw-r--r-- | mp3lib/layer2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mp3lib/layer2.c b/mp3lib/layer2.c index 867da2f2dc..f86d716882 100644 --- a/mp3lib/layer2.c +++ b/mp3lib/layer2.c @@ -18,7 +18,7 @@ static int grp_3tab[32 * 3] = { 0, }; /* used: 27 */ static int grp_5tab[128 * 3] = { 0, }; /* used: 125 */ static int grp_9tab[1024 * 3] = { 0, }; /* used: 729 */ -static real muls[27][64]; /* also used by layer 1 */ +static real muls[27][64]; /* also used by layer 1 */ static void init_layer2(void) { @@ -59,7 +59,7 @@ static void init_layer2(void) if(_has_mmx) { for(j=3,i=0;i<63;i++,j--) - *table++ = 16384 * m * pow(2.0,(double) j / 3.0); + *table++ = 16384 * m * pow(2.0,(double) j / 3.0); } else for(j=3,i=0;i<63;i++,j--) @@ -189,7 +189,7 @@ static void II_step_two(unsigned int *bit_alloc,real fraction[2][4][SBLIMIT],int for (i=jsbound;i<sblimit;i++,alloc1+=(1<<step)) { step = alloc1->bits; - bita++; /* channel 1 and channel 2 bitalloc are the same */ + bita++; /* channel 1 and channel 2 bitalloc are the same */ if ( (ba=*bita++) ) { k=(alloc2 = alloc1+ba)->bits; |