Commit a740cae4 authored by Michael Niedermayer's avatar Michael Niedermayer

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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 118d84b7
......@@ -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));
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment