diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-03 19:55:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-03 21:12:00 +0100 |
| commit | babb611d35417fb73f7f6ead90ee897af24bf198 (patch) | |
| tree | 58a065cfc428bb34148bbe4fd8f7cc8b453fb3f1 /libavcodec/mpegaudiodec_template.c | |
| parent | 04e06cdf7d35640466d6dcf88cb5bc86a7d0ee18 (diff) | |
libavcodec/mpegaudio: change CONFIG_FLOAT to USE_FLOAT
The CONFIG_ name-space is set by configure, so its better to use a
different prefix here.
This also unifies the encoder & decoder define that is used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegaudiodec_template.c')
| -rw-r--r-- | libavcodec/mpegaudiodec_template.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/mpegaudiodec_template.c b/libavcodec/mpegaudiodec_template.c index 8ca0970ef7..1f29679d91 100644 --- a/libavcodec/mpegaudiodec_template.c +++ b/libavcodec/mpegaudiodec_template.c @@ -392,7 +392,7 @@ static av_cold void decode_init_static(void) ci = ci_table[i]; cs = 1.0 / sqrt(1.0 + ci * ci); ca = cs * ci; -#if !CONFIG_FLOAT +#if !USE_FLOATS csa_table[i][0] = FIXHR(cs/4); csa_table[i][1] = FIXHR(ca/4); csa_table[i][2] = FIXHR(ca/4) + FIXHR(cs/4); @@ -828,7 +828,7 @@ static void switch_buffer(MPADecodeContext *s, int *pos, int *end_pos, v = -v; *dst = v; */ -#if CONFIG_FLOAT +#if USE_FLOATS #define READ_FLIP_SIGN(dst,src) \ v = AV_RN32A(src) ^ (get_bits1(&s->gb) << 31); \ AV_WN32A(dst, v); @@ -1137,7 +1137,7 @@ found2: /* ms stereo ONLY */ /* NOTE: the 1/sqrt(2) normalization factor is included in the global gain */ -#if CONFIG_FLOAT +#if USE_FLOATS s->fdsp.butterflies_float(g0->sb_hybrid, g1->sb_hybrid, 576); #else tab0 = g0->sb_hybrid; @@ -1152,7 +1152,7 @@ found2: } } -#if CONFIG_FLOAT +#if USE_FLOATS #if HAVE_MIPSFPU # include "mips/compute_antialias_float.h" #endif /* HAVE_MIPSFPU */ @@ -1160,10 +1160,10 @@ found2: #if HAVE_MIPSDSPR1 # include "mips/compute_antialias_fixed.h" #endif /* HAVE_MIPSDSPR1 */ -#endif /* CONFIG_FLOAT */ +#endif /* USE_FLOATS */ #ifndef compute_antialias -#if CONFIG_FLOAT +#if USE_FLOATS #define AA(j) do { \ float tmp0 = ptr[-1-j]; \ float tmp1 = ptr[ j]; \ |