generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/dcadec: remove unsignedness from constant

Browse Source 
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>
This commit is contained in:
Michael Niedermayer 2014-06-18 13:07:57 +02:00
parent 118d84b7e9
commit a740cae4a0
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/dcadec.c
View File

@ -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));
}
/**