diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-05-17 11:48:28 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-05-17 13:57:23 +0100 |
| commit | 6f2309ed2e0c5c02ab417f3f0acad23e86411079 (patch) | |
| tree | 57844dca7f956adb188092118e91d558cd76f99d /libavcodec/mpegaudiodec.c | |
| parent | 1362a291c971ba2c46c08f0533265b294030de27 (diff) | |
| download | ffmpeg-6f2309ed2e0c5c02ab417f3f0acad23e86411079.tar.gz | |
dct: build dct32 as separate object files
This builds the float and fixed-point versions of dct32 separately
instead of #including the file in dct.c and mpegaudiodec.c.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec/mpegaudiodec.c')
| -rw-r--r-- | libavcodec/mpegaudiodec.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index 8c42e09666..35e217ea3e 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -29,6 +29,7 @@ #include "get_bits.h" #include "dsputil.h" #include "mathops.h" +#include "dct32.h" /* * TODO: @@ -68,12 +69,6 @@ #include "mpegaudiodata.h" #include "mpegaudiodectab.h" -#if CONFIG_FLOAT -# include "fft.h" -#else -# include "dct32.c" -#endif - static void compute_antialias(MPADecodeContext *s, GranuleDef *g); static void apply_window_mp3_c(MPA_INT *synth_buf, MPA_INT *window, int *dither_state, OUT_INT *samples, int incr); @@ -637,7 +632,7 @@ void ff_mpa_synth_filter(MPA_INT *synth_buf_ptr, int *synth_buf_offset, offset = *synth_buf_offset; synth_buf = synth_buf_ptr + offset; - dct32(synth_buf, sb_samples); + ff_dct32_fixed(synth_buf, sb_samples); apply_window_mp3_c(synth_buf, window, dither_state, samples, incr); offset = (offset - 32) & 511; |