diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2013-01-20 15:41:52 -0800 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2013-01-22 11:55:42 -0800 |
| commit | d56668bd80075615b89aff652fe8a576bf853ceb (patch) | |
| tree | 9da3ed036b716dbaf33f5c9869578bedb6e393a2 /libavcodec/aacdec.c | |
| parent | 5959bfaca396ecaf63a8123055f499688b79cae3 (diff) | |
| download | ffmpeg-d56668bd80075615b89aff652fe8a576bf853ceb.tar.gz | |
floatdsp: move scalarproduct_float from dsputil to avfloatdsp.
This makes the aac decoder and all voice codecs independent of dsputil.
Diffstat (limited to 'libavcodec/aacdec.c')
| -rw-r--r-- | libavcodec/aacdec.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index b016611fcf..5afc9b820e 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -895,7 +895,6 @@ static av_cold int aac_decode_init(AVCodecContext *avctx) ff_aac_sbr_init(); - 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); @@ -1358,7 +1357,7 @@ static int decode_spectrum_and_dequant(AACContext *ac, float coef[1024], cfo[k] = ac->random_state; } - band_energy = ac->dsp.scalarproduct_float(cfo, cfo, off_len); + band_energy = ac->fdsp.scalarproduct_float(cfo, cfo, off_len); scale = sf[idx] / sqrtf(band_energy); ac->fdsp.vector_fmul_scalar(cfo, cfo, scale, off_len); } |