xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2025-02-16 09:58:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit 'f2ce63246f5c934429f9cb857a794e07624d7912'

Browse Source 
* commit 'f2ce63246f5c934429f9cb857a794e07624d7912':
  dcadec: replace ldexpf with a multiplication by a constant

Conflicts:
	libavcodec/dcadec.c

See: 6da06ef6bbc01b713f67ffb94e7697eb2393ebe4
See: 9ccb5455ca8c63eb330abd3c2ed6a9b0ae3b755e
See: 6b88f22e895314164eef00ccbdbf11ad97a7c56f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-06-18 13:03:42 +02:00
commit 118d84b7e9
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/dcadec.c
View File

@ -2117,8 +2117,14 @@ 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
}
/**