summaryrefslogtreecommitdiff
path: root/libavcodec/wmadec.c
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2007-08-11 23:17:03 +0000
committerAurelien Jacobs <aurel@gnuage.org>2007-08-11 23:17:03 +0000
commit295f37379269e2df0e8983fbe89787ef1f49dc93 (patch)
tree917a4d87f90782008ce0de378f34cbbc623604c0 /libavcodec/wmadec.c
parentb0f3382873d275c4bd2e04f6f4f74f75162e5325 (diff)
various simplifications around recent av_clip_int16() usage
Originally committed as revision 10080 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/wmadec.c')
-rw-r--r--libavcodec/wmadec.c6
1 files changed, 2 insertions, 4 deletions
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 */