From: Ronald S. Bultje <rsbultje@gmail.com>
Date: Wed, 7 Mar 2012 19:06:20 +0000 (-0800)
Subject: dca: don't use av_clip_uintp2().
X-Git-Tag: v9_beta1~2482
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=93b53ffb1abbe4aa7a922a830c8ae2e3ac098de3;p=platform%2Fupstream%2Flibav.git

dca: don't use av_clip_uintp2().

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

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);