diff options
author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-04-26 10:08:16 +0000 |
---|---|---|
committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-04-26 10:08:16 +0000 |
commit | 681827cb68fa33a3722e0a762b5b5f5477ef7291 (patch) | |
tree | 9888b0af558ccf3a4df67d833f5f71a6e269d7ac /mp3lib | |
parent | cf6a122e569e4af5e1c724183f86ab2753e0990a (diff) | |
download | mpv-681827cb68fa33a3722e0a762b5b5f5477ef7291.tar.bz2 mpv-681827cb68fa33a3722e0a762b5b5f5477ef7291.tar.xz |
reorder funcs to avoid warnings/errors (gccs are nowadays are more pickier about code than gcc2.95 with -ansi)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12292 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mp3lib')
-rw-r--r-- | mp3lib/decod386.c | 65 |
1 files changed, 31 insertions, 34 deletions
diff --git a/mp3lib/decod386.c b/mp3lib/decod386.c index a2dda57994..e80a654749 100644 --- a/mp3lib/decod386.c +++ b/mp3lib/decod386.c @@ -113,40 +113,6 @@ static int synth_1to1_mono2stereo(real *bandPtr,unsigned char *samples,int *pnt) return ret; } - -#ifdef USE_FAKE_MONO -static int synth_1to1_l(real *bandPtr,int channel,unsigned char *out,int *pnt) -{ - int i,ret; - - ret = synth_1to1(bandPtr,channel,out,pnt); - out = out + *pnt - 128; - - for(i=0;i<32;i++) { - ((short *)out)[1] = ((short *)out)[0]; - out+=4; - } - - return ret; -} - - -static int synth_1to1_r(real *bandPtr,int channel,unsigned char *out,int *pnt) -{ - int i,ret; - - ret = synth_1to1(bandPtr,channel,out,pnt); - out = out + *pnt - 128; - - for(i=0;i<32;i++) { - ((short *)out)[0] = ((short *)out)[1]; - out+=4; - } - - return ret; -} -#endif - static synth_func_t synth_func; #if defined(CAN_COMPILE_X86_ASM) @@ -277,3 +243,34 @@ static int synth_1to1(real *bandPtr,int channel,unsigned char *out,int *pnt) } +#ifdef USE_FAKE_MONO +static int synth_1to1_l(real *bandPtr,int channel,unsigned char *out,int *pnt) +{ + int i,ret; + + ret = synth_1to1(bandPtr,channel,out,pnt); + out = out + *pnt - 128; + + for(i=0;i<32;i++) { + ((short *)out)[1] = ((short *)out)[0]; + out+=4; + } + + return ret; +} + +static int synth_1to1_r(real *bandPtr,int channel,unsigned char *out,int *pnt) +{ + int i,ret; + + ret = synth_1to1(bandPtr,channel,out,pnt); + out = out + *pnt - 128; + + for(i=0;i<32;i++) { + ((short *)out)[0] = ((short *)out)[1]; + out+=4; + } + + return ret; +} +#endif |