diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-09 01:02:54 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-09 01:59:09 +0400 |
| commit | 7e22514d98ecd56cc4e55dac7c813551e2152b80 (patch) | |
| tree | 13c47e1e1215525323177a008d5406a7d61a418a /libavcodec/ac3enc_fixed.c | |
| parent | e016e3c9d7ce1493b952bdd8232f7e03077469a3 (diff) | |
| parent | 3b81a18ba30bf18bab78f56744d8f3e1e4060104 (diff) | |
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_fixed.c')
| -rw-r--r-- | libavcodec/ac3enc_fixed.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/ac3enc_fixed.c b/libavcodec/ac3enc_fixed.c index daf84cbd9a..689f822981 100644 --- a/libavcodec/ac3enc_fixed.c +++ b/libavcodec/ac3enc_fixed.c @@ -68,10 +68,11 @@ av_cold int AC3_NAME(mdct_init)(AC3EncodeContext *s) /* * Apply KBD window to input samples prior to MDCT. */ -static void apply_window(DSPContext *dsp, int16_t *output, const int16_t *input, +static void apply_window(void *dsp, int16_t *output, const int16_t *input, const int16_t *window, unsigned int len) { - dsp->apply_window_int16(output, input, window, len); + DSPContext *dsp0 = dsp; + dsp0->apply_window_int16(output, input, window, len); } |