[FFmpeg-cvslog] adpcm: use av_clip() in adpcm_ima_expand_nibble().

Ronald S. Bultje git at videolan.org
Tue Mar 20 00:16:49 CET 2012


ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Sat Mar 17 12:58:03 2012 -0700| [89f3aa8ce20a68c106c7694af44fd9cab00fd26b] | committer: Ronald S. Bultje

adpcm: use av_clip() in adpcm_ima_expand_nibble().

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=89f3aa8ce20a68c106c7694af44fd9cab00fd26b
---

 libavcodec/adpcm.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index ed6d0c5..ab9f77b 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -150,8 +150,7 @@ static inline short adpcm_ima_expand_nibble(ADPCMChannelStatus *c, char nibble,
 
     step = ff_adpcm_step_table[c->step_index];
     step_index = c->step_index + ff_adpcm_index_table[(unsigned)nibble];
-    if (step_index < 0) step_index = 0;
-    else if (step_index > 88) step_index = 88;
+    step_index = av_clip(step_index, 0, 88);
 
     sign = nibble & 8;
     delta = nibble & 7;



More information about the ffmpeg-cvslog mailing list