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/mpegaudioenc_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/mpegaudioenc_template.c')
| -rw-r--r-- | libavcodec/mpegaudioenc_template.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mpegaudioenc_template.c b/libavcodec/mpegaudioenc_template.c index a567dcdbb4..b2dfe78254 100644 --- a/libavcodec/mpegaudioenc_template.c +++ b/libavcodec/mpegaudioenc_template.c @@ -64,7 +64,7 @@ typedef struct MpegAudioContext { int16_t filter_bank[512]; int scale_factor_table[64]; unsigned char scale_diff_table[128]; -#ifdef USE_FLOATS +#if USE_FLOATS float scale_factor_inv_table[64]; #else int8_t scale_factor_shift[64]; @@ -158,7 +158,7 @@ static av_cold int MPA_encode_init(AVCodecContext *avctx) if (v <= 0) v = 1; s->scale_factor_table[i] = v; -#ifdef USE_FLOATS +#if USE_FLOATS s->scale_factor_inv_table[i] = exp2(-(3 - i) / 3.0) / (float)(1 << 20); #else #define P 15 @@ -681,7 +681,7 @@ static void encode_frame(MpegAudioContext *s, for(m=0;m<3;m++) { sample = s->sb_samples[ch][k][l + m][i]; /* divide by scale factor */ -#ifdef USE_FLOATS +#if USE_FLOATS { float a; a = (float)sample * s->scale_factor_inv_table[s->scale_factors[ch][i][k]]; |