diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 14:04:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 14:04:50 +0100 |
| commit | 6e6e1708984e45881b9a5d4e26c3e7de852c54d5 (patch) | |
| tree | 5e04d38f8e152faf98921843ca5e4530cbdc46a4 /libavcodec/wmadec.c | |
| parent | b1b870fbd7185bffbe27c5918001b40a8ff8b920 (diff) | |
| parent | 42d324694883cdf1fff1612ac70fa403692a1ad4 (diff) | |
| download | ffmpeg-6e6e1708984e45881b9a5d4e26c3e7de852c54d5.tar.gz | |
Merge commit '42d324694883cdf1fff1612ac70fa403692a1ad4'
* commit '42d324694883cdf1fff1612ac70fa403692a1ad4':
floatdsp: move vector_fmul_reverse from dsputil to avfloatdsp.
Conflicts:
libavcodec/arm/dsputil_init_vfp.c
libavcodec/arm/dsputil_vfp.S
libavcodec/dsputil.c
libavcodec/ppc/float_altivec.c
libavcodec/x86/dsputil.asm
libavutil/x86/float_dsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmadec.c')
| -rw-r--r-- | libavcodec/wmadec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index 25200dac68..525df6d353 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -408,7 +408,7 @@ static void wma_window(WMACodecContext *s, float *out) block_len = s->block_len; bsize = s->frame_len_bits - s->block_len_bits; - s->dsp.vector_fmul_reverse(out, in, s->windows[bsize], block_len); + s->fdsp.vector_fmul_reverse(out, in, s->windows[bsize], block_len); } else { block_len = 1 << s->next_block_len_bits; @@ -417,7 +417,7 @@ static void wma_window(WMACodecContext *s, float *out) memcpy(out, in, n*sizeof(float)); - s->dsp.vector_fmul_reverse(out+n, in+n, s->windows[bsize], block_len); + s->fdsp.vector_fmul_reverse(out+n, in+n, s->windows[bsize], block_len); memset(out+n+block_len, 0, n*sizeof(float)); } |