From 50f563f9279f01a9f2177cac84178b153365f037 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 8 Oct 2009 11:25:01 +0000
Subject: cosmetics: Remove some pointless parentheses from return calls.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29759 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 mp3lib/sr1.c  | 10 +++++-----
 mp3lib/test.c |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'mp3lib')

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;
-- 
cgit v1.2.3