projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
626964a
)
dca: don't use av_clip_uintp2().
author
Ronald S. Bultje
<rsbultje@gmail.com>
Wed, 7 Mar 2012 19:06:20 +0000
(11:06 -0800)
committer
Ronald S. Bultje
<rsbultje@gmail.com>
Wed, 7 Mar 2012 19:31:42 +0000
(11:31 -0800)
The argument is not a literal, thus causing the ARM v6 or later
builds to break.
libavcodec/dca.c
patch
|
blob
|
history
diff --git
a/libavcodec/dca.c
b/libavcodec/dca.c
index
6dbcda0
..
8e4f819
100644
(file)
--- 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);