summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-07-11 19:28:22 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-07-11 19:28:22 +0000
commitca588e6a9f8393cd9996a238bdaca5cbdfcf702f (patch)
tree28b821c7559ad47575681b4f40ade1ae0b042c56 /libmpcodecs
parent792dc55d19731a01b1cf3c17f86193fec1f6bc95 (diff)
downloadmpv-ca588e6a9f8393cd9996a238bdaca5cbdfcf702f.tar.bz2
mpv-ca588e6a9f8393cd9996a238bdaca5cbdfcf702f.tar.xz
Simplify imaadpcm return statement
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27261 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/ad_imaadpcm.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libmpcodecs/ad_imaadpcm.c b/libmpcodecs/ad_imaadpcm.c
index 33f07b463b..eae7c11a54 100644
--- a/libmpcodecs/ad_imaadpcm.c
+++ b/libmpcodecs/ad_imaadpcm.c
@@ -321,6 +321,5 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m
res = decode_func((unsigned short*)buf, sh_audio->a_in_buffer,
sh_audio->wf->nChannels, sh_audio->ds->ss_mul);
- if (res < 0) return res;
- else return 2 * res;
+ return res < 0 ? res : 2 * res;
}