From a740cae4a0803a78c183f754189294b948ac6865 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 18 Jun 2014 13:07:57 +0200 Subject: avcodec/dcadec: remove unsignedness from constant POSIX gurantees >=32bit so it all fits in signed int Also >=32bit ints are assumed througout the codebase Signed-off-by: Michael Niedermayer --- libavcodec/dcadec.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'libavcodec/dcadec.c') diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index bef5cd1..c671fcd 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -2117,14 +2117,7 @@ static float dca_dmix_code(unsigned code) { int sign = (code >> 8) - 1; code &= 0xff; -<<<<<<< HEAD -#define POW2_MINUS15 .000030517578125 - return ((dca_dmixtable[code] ^ sign) - sign) * POW2_MINUS15; -||||||| merged common ancestors - return ldexpf((dca_dmixtable[code] ^ sign) - sign, -15); -======= - return ((dca_dmixtable[code] ^ sign) - sign) * (1.0 / (1U << 15)); ->>>>>>> f2ce63246f5c934429f9cb857a794e07624d7912 + return ((dca_dmixtable[code] ^ sign) - sign) * (1.0 / (1 << 15)); } /** -- cgit v1.1