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/mpegaudiodsp_template.c | |
| parent | 04e06cdf7d35640466d6dcf88cb5bc86a7d0ee18 (diff) | |
| download | ffmpeg-babb611d35417fb73f7f6ead90ee897af24bf198.tar.gz | |
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/mpegaudiodsp_template.c')
| -rw-r--r-- | libavcodec/mpegaudiodsp_template.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mpegaudiodsp_template.c b/libavcodec/mpegaudiodsp_template.c index f79e068a7b..62454ca306 100644 --- a/libavcodec/mpegaudiodsp_template.c +++ b/libavcodec/mpegaudiodsp_template.c @@ -27,7 +27,7 @@ #include "mpegaudiodsp.h" #include "mpegaudio.h" -#if CONFIG_FLOAT +#if USE_FLOATS #define RENAME(n) n##_float static inline float round_sample(float *sum) @@ -125,7 +125,7 @@ void RENAME(ff_mpadsp_apply_window)(MPA_INT *synth_buf, MPA_INT *window, register const MPA_INT *w, *w2, *p; int j; OUT_INT *samples2; -#if CONFIG_FLOAT +#if USE_FLOATS float sum, sum2; #else int64_t sum, sum2; @@ -200,7 +200,7 @@ av_cold void RENAME(ff_mpa_synth_init)(MPA_INT *window) for(i=0;i<257;i++) { INTFLOAT v; v = ff_mpa_enwindow[i]; -#if CONFIG_FLOAT +#if USE_FLOATS v *= 1.0 / (1LL<<(16 + FRAC_BITS)); #endif window[i] = v; |