diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-08 23:02:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-08 23:59:09 +0200 |
| commit | 7e22514d98ecd56cc4e55dac7c813551e2152b80 (patch) | |
| tree | 13c47e1e1215525323177a008d5406a7d61a418a /libavcodec/ac3enc_template.c | |
| parent | e016e3c9d7ce1493b952bdd8232f7e03077469a3 (diff) | |
| parent | 3b81a18ba30bf18bab78f56744d8f3e1e4060104 (diff) | |
| download | ffmpeg-7e22514d98ecd56cc4e55dac7c813551e2152b80.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
float_dsp: ppc: add a separate header for Altivec function prototypes
ARM: fix float_dsp breakage from d5a7229
Add a float DSP framework to libavutil
PPC: Move types_altivec.h and util_altivec.h from libavcodec to libavutil
ARM: Move asm.S from libavcodec to libavutil
vc1dsp: mark put/avg_vc1_mspel_mc() always_inline
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ac3enc_template.c')
| -rw-r--r-- | libavcodec/ac3enc_template.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavcodec/ac3enc_template.c b/libavcodec/ac3enc_template.c index 20ac301a43..e81bfce5a8 100644 --- a/libavcodec/ac3enc_template.c +++ b/libavcodec/ac3enc_template.c @@ -33,7 +33,7 @@ static void scale_coefficients(AC3EncodeContext *s); -static void apply_window(DSPContext *dsp, SampleType *output, +static void apply_window(void *dsp, SampleType *output, const SampleType *input, const SampleType *window, unsigned int len); @@ -110,8 +110,13 @@ static void apply_mdct(AC3EncodeContext *s) AC3Block *block = &s->blocks[blk]; const SampleType *input_samples = &s->planar_samples[ch][blk * AC3_BLOCK_SIZE]; +#if CONFIG_AC3ENC_FLOAT + apply_window(&s->fdsp, s->windowed_samples, input_samples, + s->mdct_window, AC3_WINDOW_SIZE); +#else apply_window(&s->dsp, s->windowed_samples, input_samples, s->mdct_window, AC3_WINDOW_SIZE); +#endif if (s->fixed_point) block->coeff_shift[ch+1] = normalize_samples(s); |