diff options
Diffstat (limited to 'mp3lib')
-rw-r--r-- | mp3lib/sr1.c | 10 | ||||
-rw-r--r-- | mp3lib/test.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mp3lib/sr1.c b/mp3lib/sr1.c index 68180533e2..b4f2a146d9 100644 --- a/mp3lib/sr1.c +++ b/mp3lib/sr1.c @@ -75,7 +75,7 @@ int mp3_read(char *buf,int size); //void mp3_seek(int pos){ // fseek(mp3_file,pos,SEEK_SET); -// return (MP3_fpos=ftell(mp3_file)); +// return MP3_fpos = ftell(mp3_file); //} /* Frame reader */ @@ -164,7 +164,7 @@ LOCAL unsigned int get1bit(void) bitindex++; wordpointer += (bitindex>>3); bitindex &= 7; - return ((rval>>7)&1); + return (rval >> 7) & 1; } LOCAL void set_pointer(int backstep) @@ -533,8 +533,8 @@ int MP3_Open(char *filename,int buffsize){ int MP3_DecodeFrame(unsigned char *hova,short single){ pcm_sample = hova; pcm_point = 0; - if(!read_frame(&fr))return(0); - if(single==-2){ set_pointer(512); return(1); } + if(!read_frame(&fr)) return 0; + if(single==-2){ set_pointer(512); return 1; } if(fr.error_protection) getbits(16); /* skip crc */ fr.single=single; switch(fr.lay){ @@ -545,7 +545,7 @@ int MP3_DecodeFrame(unsigned char *hova,short single){ return 0; // unsupported } // ++MP3_frames; - return(pcm_point?pcm_point:2); + return pcm_point ? pcm_point : 2; } // Prints last frame header in ascii. diff --git a/mp3lib/test.c b/mp3lib/test.c index 5246ad3ff8..8ae1c68d41 100644 --- a/mp3lib/test.c +++ b/mp3lib/test.c @@ -17,7 +17,7 @@ static inline unsigned int GetTimer(void){ // float s; gettimeofday(&tv,&tz); // s=tv.tv_usec;s*=0.000001;s+=tv.tv_sec; - return (tv.tv_sec*1000000+tv.tv_usec); + return tv.tv_sec * 1000000 + tv.tv_usec; } static FILE* mp3file=NULL; |