diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-18 13:07:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-18 13:46:51 +0200 |
| commit | a740cae4a0803a78c183f754189294b948ac6865 (patch) | |
| tree | dcd2252f1a81775103558d6eca3a1d62b91fe7e1 /libavcodec | |
| parent | 118d84b7e937bdffba91a8879cdf92df93285aa6 (diff) | |
| download | ffmpeg-a740cae4a0803a78c183f754189294b948ac6865.tar.gz | |
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 <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/dcadec.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index bef5cd1b39..c671fcd722 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)); } /** |