summaryrefslogtreecommitdiffstats
path: root/mp3lib
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-10-08 11:25:01 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-10-08 11:25:01 +0000
commit50f563f9279f01a9f2177cac84178b153365f037 (patch)
tree5b594cc603e9e9aa42ef9545672578c174d00f27 /mp3lib
parent77bc2b34b7c8c36d21bee5a48cd73a0e110122f8 (diff)
downloadmpv-50f563f9279f01a9f2177cac84178b153365f037.tar.bz2
mpv-50f563f9279f01a9f2177cac84178b153365f037.tar.xz
cosmetics: Remove some pointless parentheses from return calls.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29759 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mp3lib')
-rw-r--r--mp3lib/sr1.c10
-rw-r--r--mp3lib/test.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/mp3lib/sr1.c b/mp3lib/sr1.c
index 224f838c7d..e02c1cfd8c 100644
--- a/mp3lib/sr1.c
+++ b/mp3lib/sr1.c
@@ -79,7 +79,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 */
@@ -168,7 +168,7 @@ LOCAL unsigned int get1bit(void)
bitindex++;
wordpointer += (bitindex>>3);
bitindex &= 7;
- return ((rval>>7)&1);
+ return (val >> 7) & 1;
}
LOCAL void set_pointer(int backstep)
@@ -537,8 +537,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){
@@ -549,7 +549,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;