You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-06-14 22:15:12 +02:00
Merge commit 'f2ce63246f5c934429f9cb857a794e07624d7912'
* commit 'f2ce63246f5c934429f9cb857a794e07624d7912': dcadec: replace ldexpf with a multiplication by a constant Conflicts: libavcodec/dcadec.c See:6da06ef6bb
See:9ccb5455ca
See:6b88f22e89
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
@ -2117,8 +2117,14 @@ static float dca_dmix_code(unsigned code)
|
|||||||
{
|
{
|
||||||
int sign = (code >> 8) - 1;
|
int sign = (code >> 8) - 1;
|
||||||
code &= 0xff;
|
code &= 0xff;
|
||||||
|
<<<<<<< HEAD
|
||||||
#define POW2_MINUS15 .000030517578125
|
#define POW2_MINUS15 .000030517578125
|
||||||
return ((dca_dmixtable[code] ^ sign) - sign) * POW2_MINUS15;
|
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
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user