diff options
| author | Ganesh Ajjanagadde <gajjanagadde@gmail.com> | 2015-11-14 10:52:30 -0500 |
|---|---|---|
| committer | Ganesh Ajjanagadde <gajjanagadde@gmail.com> | 2015-11-14 10:58:39 -0500 |
| commit | 11f0acf829e26279c5f2a414c6860bd4933f29af (patch) | |
| tree | 6b9bd171d1d7c4e97a3215c833c2e5970c7191b9 | |
| parent | c5fa42c69aeccd644fb5a42b4995602d206f168b (diff) | |
avcodec/mpegaudio: use predefined M_SQRT2
M_SQRT2 is defined in math.h, or in avutil/mathematics.h for
compatibility hacks. This uses this value instead of an ad-hoc define.
Fixed point values produced by FIX() remain identical.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
| -rw-r--r-- | libavcodec/mpegaudioenc_template.c | 4 | ||||
| -rw-r--r-- | libavcodec/mpegaudiotab.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/mpegaudioenc_template.c b/libavcodec/mpegaudioenc_template.c index ce93cc7c6d..b91d0a8895 100644 --- a/libavcodec/mpegaudioenc_template.c +++ b/libavcodec/mpegaudioenc_template.c @@ -244,11 +244,11 @@ static void idct32(int *out, int *tab) do { int x1, x2, x3, x4; - x3 = MUL(t[16], FIX(SQRT2*0.5)); + x3 = MUL(t[16], FIX(M_SQRT2*0.5)); x4 = t[0] - x3; x3 = t[0] + x3; - x2 = MUL(-(t[24] + t[8]), FIX(SQRT2*0.5)); + x2 = MUL(-(t[24] + t[8]), FIX(M_SQRT2*0.5)); x1 = MUL((t[8] - x2), xp[0]); x2 = MUL((t[8] + x2), xp[1]); diff --git a/libavcodec/mpegaudiotab.h b/libavcodec/mpegaudiotab.h index 42d42d883d..bb2e5de4ea 100644 --- a/libavcodec/mpegaudiotab.h +++ b/libavcodec/mpegaudiotab.h @@ -33,8 +33,6 @@ #include <stdint.h> #include "mpegaudio.h" -#define SQRT2 1.41421356237309514547 - static const int costab32[30] = { FIX(0.54119610014619701222), FIX(1.3065629648763763537), |