[FFmpeg-cvslog] dca: don't use av_clip_uintp2().

Ronald S. Bultje git at videolan.org
Thu Mar 8 03:10:38 CET 2012


ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Wed Mar  7 11:06:20 2012 -0800| [93b53ffb1abbe4aa7a922a830c8ae2e3ac098de3] | committer: Ronald S. Bultje

dca: don't use av_clip_uintp2().

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

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

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

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



More information about the ffmpeg-cvslog mailing list