From 295f37379269e2df0e8983fbe89787ef1f49dc93 Mon Sep 17 00:00:00 2001
From: Aurelien Jacobs <aurel@gnuage.org>
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/wmadec.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'libavcodec/wmadec.c')

diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c
index 01bd47f8e1..1573e5d783 100644
--- a/libavcodec/wmadec.c
+++ b/libavcodec/wmadec.c
@@ -712,7 +712,7 @@ static int wma_decode_block(WMACodecContext *s)
 /* decode a frame of frame_len samples */
 static int wma_decode_frame(WMACodecContext *s, int16_t *samples)
 {
-    int ret, i, n, a, ch, incr;
+    int ret, i, n, ch, incr;
     int16_t *ptr;
     float *iptr;
 
@@ -739,9 +739,7 @@ static int wma_decode_frame(WMACodecContext *s, int16_t *samples)
         iptr = s->frame_out[ch];
 
         for(i=0;i<n;i++) {
-            a = lrintf(*iptr++);
-            a = av_clip_int16(a);
-            *ptr = a;
+            *ptr = av_clip_int16(lrintf(*iptr++));
             ptr += incr;
         }
         /* prepare for next block */
-- 
cgit v1.2.3