# HG changeset patch
# User aurel
# Date 1186874961 0
# Node ID 8b6ffd245ee2384c72c08d0e87ce0d8d3d25d72c
# Parent  9c37f7a3ff48336840f52343bc5667253976ee58
more usage of av_clip()

diff -r 9c37f7a3ff48 -r 8b6ffd245ee2 adpcm.c
--- a/adpcm.c	Sat Aug 11 23:23:20 2007 +0000
+++ b/adpcm.c	Sat Aug 11 23:29:21 2007 +0000
@@ -706,11 +706,7 @@
     c->predictor = av_clip_int16(c->predictor);
     /* calculate new step and clamp it to range 511..32767 */
     new_step = (ct_adpcm_table[nibble & 7] * c->step) >> 8;
-    c->step = new_step;
-    if(c->step < 511)
-        c->step = 511;
-    if(c->step > 32767)
-        c->step = 32767;
+    c->step = av_clip(new_step, 511, 32767);
 
     return (short)c->predictor;
 }
@@ -723,16 +719,8 @@
     delta = nibble & ((1<<(size-1))-1);
     diff = delta << (7 + c->step + shift);
 
-    if (sign)
-        c->predictor -= diff;
-    else
-        c->predictor += diff;
-
     /* clamp result */
-    if (c->predictor > 16256)
-        c->predictor = 16256;
-    else if (c->predictor < -16384)
-        c->predictor = -16384;
+    c->predictor = av_clip(c->predictor + (sign ? -diff : diff), -16384,16256);
 
     /* calculate new step */
     if (delta >= (2*size - 3) && c->step < 3)