[libav-commits] dca: don't use av_clip_uintp2().

Message ID 20120307193549.7F8CE5E081@aruru.libav.org
State New
Headers show

Commit Message

Janne Grunau March 7, 2012, 7:35 p.m.
Module: libav
Branch: master
Commit: 93b53ffb1abbe4aa7a922a830c8ae2e3ac098de3

Author:    Ronald S. Bultje <rsbultje@gmail.com>
Committer: Ronald S. Bultje <rsbultje@gmail.com>
Date:      Wed Mar  7 11:06:20 2012 -0800

dca: don't use av_clip_uintp2().

The argument is not a literal, thus causing the ARM v6 or later
builds to break.

---

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

Patch

diff --git a/libavcodec/dca.c b/libavcodec/dca.c
index 6dbcda0..8e4f819 100644
--- a/libavcodec/dca.c
+++ b/libavcodec/dca.c
@@ -645,7 +645,7 @@  static inline int get_scale(GetBitContext *gb, int level, int value, int log2ran
     if (level < 5) {
         /* huffman encoded */
         value += get_bitalloc(gb, &dca_scalefactor, level);
-        value = av_clip_uintp2(value, log2range);
+        value = av_clip(value, 0, (1 << log2range) - 1);
     } else if (level < 8) {
         if (level + 1 > log2range) {
             skip_bits(gb, level + 1 - log2range);