diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-11-16 06:54:22 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-11-16 07:01:46 +0200 |
| commit | 287b62163eed8811b6cd33716c0691d328947d48 (patch) | |
| tree | 3143d2cb17b32a19e3e7e0aa428210d1bba3eb0b /mp3lib/sr1.c | |
| parent | 507f4fe6c7811558b1367e4b64855ae7f9bc8da8 (diff) | |
| parent | b411278fbb00767b8013604157a43e0203f66f4c (diff) | |
| download | mpv-287b62163eed8811b6cd33716c0691d328947d48.tar.bz2 mpv-287b62163eed8811b6cd33716c0691d328947d48.tar.xz | |
Merge svn changes up to r29912
Diffstat (limited to 'mp3lib/sr1.c')
| -rw-r--r-- | mp3lib/sr1.c | 10 |
1 files changed, 5 insertions, 5 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. |