summaryrefslogtreecommitdiff
path: root/libavcodec/aac.c
diff options
context:
space:
mode:
authorAlex Converse <alex.converse@gmail.com>2008-09-18 15:35:08 +0000
committerRobert Swain <robert.swain@gmail.com>2008-09-18 15:35:08 +0000
commitc8947a561210ddf14533691df45b63f22e7736a4 (patch)
treed0cdcb01e1164bd27cdc18a9f83f8963139096d4 /libavcodec/aac.c
parentd464bceff2c9a9106f81c5c060596a92dfbb7fad (diff)
Cast the return value of get_bits() to signed integer such that the subtraction
is conducted as a signed calculation. Patch by Alex Converse (alex converse gmail com) Originally committed as revision 15362 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/aac.c')
-rw-r--r--libavcodec/aac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/aac.c b/libavcodec/aac.c
index 12037e0339..504f987492 100644
--- a/libavcodec/aac.c
+++ b/libavcodec/aac.c
@@ -979,7 +979,7 @@ static int decode_cce(AACContext * ac, GetBitContext * gb, ChannelElement * che)
}
sign = get_bits(gb, 1);
- scale = pow(2., pow(2., get_bits(gb, 2) - 3));
+ scale = pow(2., pow(2., (int)get_bits(gb, 2) - 3));
if ((ret = decode_ics(ac, sce, gb, 0, 0)))
return ret;