diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-18 13:03:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-18 13:06:09 +0200 |
| commit | 118d84b7e937bdffba91a8879cdf92df93285aa6 (patch) | |
| tree | b3743f46549c492f6f3cfd8e0f2a602e4050bb35 | |
| parent | 40c9d43086890df11389ceefd88f517471e41202 (diff) | |
| parent | f2ce63246f5c934429f9cb857a794e07624d7912 (diff) | |
| download | ffmpeg-118d84b7e937bdffba91a8879cdf92df93285aa6.tar.gz | |
Merge commit 'f2ce63246f5c934429f9cb857a794e07624d7912'
* 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>
| -rw-r--r-- | libavcodec/dcadec.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index 9847cf9842..bef5cd1b39 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -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 } /** |