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/aacdec.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/aacdec.c')
-rw-r--r-- | libavcodec/aacdec.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 4d4291dc50..b638e3b68e 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -79,7 +79,7 @@ Parametric Stereo. */ - +#include "libavutil/float_dsp.h" #include "avcodec.h" #include "internal.h" #include "get_bits.h" @@ -901,6 +901,7 @@ static av_cold int aac_decode_init(AVCodecContext *avctx) ff_dsputil_init(&ac->dsp, avctx); ff_fmt_convert_init(&ac->fmt_conv, avctx); + avpriv_float_dsp_init(&ac->fdsp, avctx->flags & CODEC_FLAG_BITEXACT); ac->random_state = 0x1f2e3d4c; @@ -2069,10 +2070,10 @@ static void windowing_and_mdct_ltp(AACContext *ac, float *out, const float *swindow_prev = ics->use_kb_window[1] ? ff_aac_kbd_short_128 : ff_sine_128; if (ics->window_sequence[0] != LONG_STOP_SEQUENCE) { - ac->dsp.vector_fmul(in, in, lwindow_prev, 1024); + ac->fdsp.vector_fmul(in, in, lwindow_prev, 1024); } else { memset(in, 0, 448 * sizeof(float)); - ac->dsp.vector_fmul(in + 448, in + 448, swindow_prev, 128); + ac->fdsp.vector_fmul(in + 448, in + 448, swindow_prev, 128); } if (ics->window_sequence[0] != LONG_START_SEQUENCE) { ac->dsp.vector_fmul_reverse(in + 1024, in + 1024, lwindow, 1024); |