From 295f37379269e2df0e8983fbe89787ef1f49dc93 Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Sat, 11 Aug 2007 23:17:03 +0000 Subject: various simplifications around recent av_clip_int16() usage Originally committed as revision 10080 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/adx.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'libavcodec/adx.c') diff --git a/libavcodec/adx.c b/libavcodec/adx.c index 7185a32ce0..593c19de65 100644 --- a/libavcodec/adx.c +++ b/libavcodec/adx.c @@ -108,19 +108,17 @@ static void adx_decode(short *out,const unsigned char *in,PREV *prev) // d>>=4; if (d&8) d-=16; d = ((signed char)d >> 4); s0 = (BASEVOL*d*scale + SCALE1*s1 - SCALE2*s2)>>14; - s0 = av_clip_int16(s0); - *out++=s0; s2 = s1; - s1 = s0; + s1 = av_clip_int16(s0); + *out++=s1; d = in[i]; //d&=15; if (d&8) d-=16; d = ((signed char)(d<<4) >> 4); s0 = (BASEVOL*d*scale + SCALE1*s1 - SCALE2*s2)>>14; - s0 = av_clip_int16(s0); - *out++=s0; s2 = s1; - s1 = s0; + s1 = av_clip_int16(s0); + *out++=s1; } prev->s1 = s1; prev->s2 = s2; -- cgit v1.2.3