diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 14:13:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 14:13:54 +0100 |
| commit | 24604ebaf85b5436d10da811f455dd710b353aca (patch) | |
| tree | 46988a19c56e7914715dc3852e6588fb887c6c77 /libavcodec/wmadec.c | |
| parent | 6e6e1708984e45881b9a5d4e26c3e7de852c54d5 (diff) | |
| parent | 5959bfaca396ecaf63a8123055f499688b79cae3 (diff) | |
| download | ffmpeg-24604ebaf85b5436d10da811f455dd710b353aca.tar.gz | |
Merge commit '5959bfaca396ecaf63a8123055f499688b79cae3'
* commit '5959bfaca396ecaf63a8123055f499688b79cae3':
floatdsp: move butterflies_float from dsputil to avfloatdsp.
Conflicts:
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/imc.c
libavcodec/mpegaudiodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmadec.c')
| -rw-r--r-- | libavcodec/wmadec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index 525df6d353..cf8331b613 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -731,7 +731,7 @@ static int wma_decode_block(WMACodecContext *s) s->channel_coded[0] = 1; } - s->dsp.butterflies_float(s->coefs[0], s->coefs[1], s->block_len); + s->fdsp.butterflies_float(s->coefs[0], s->coefs[1], s->block_len); } next: |