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/aacdec.c | |
parent | 6e6e1708984e45881b9a5d4e26c3e7de852c54d5 (diff) | |
parent | 5959bfaca396ecaf63a8123055f499688b79cae3 (diff) | |
download | ffmpeg-streaming-24604ebaf85b5436d10da811f455dd710b353aca.zip ffmpeg-streaming-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/aacdec.c')
-rw-r--r-- | libavcodec/aacdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 0c9b0ad..fba7de5 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -1729,9 +1729,9 @@ static void apply_mid_side_stereo(AACContext *ac, ChannelElement *cpe) if (cpe->ms_mask[idx] && cpe->ch[0].band_type[idx] < NOISE_BT && cpe->ch[1].band_type[idx] < NOISE_BT) { for (group = 0; group < ics->group_len[g]; group++) { - ac->dsp.butterflies_float(ch0 + group * 128 + offsets[i], - ch1 + group * 128 + offsets[i], - offsets[i+1] - offsets[i]); + ac->fdsp.butterflies_float(ch0 + group * 128 + offsets[i], + ch1 + group * 128 + offsets[i], + offsets[i+1] - offsets[i]); } } } |