From 5959bfaca396ecaf63a8123055f499688b79cae3 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Sun, 20 Jan 2013 15:41:14 -0800 Subject: floatdsp: move butterflies_float from dsputil to avfloatdsp. This makes wmadec/enc, twinvq and mpegaudiodec (i.e. mp2/mp3) independent of dsputil. --- libavcodec/twinvq.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'libavcodec/twinvq.c') diff --git a/libavcodec/twinvq.c b/libavcodec/twinvq.c index b59031bdb9..754d7bfa39 100644 --- a/libavcodec/twinvq.c +++ b/libavcodec/twinvq.c @@ -178,7 +178,6 @@ static const ModeTab mode_44_48 = { typedef struct TwinContext { AVCodecContext *avctx; AVFrame frame; - DSPContext dsp; AVFloatDSPContext fdsp; FFTContext mdct_ctx[3]; @@ -693,7 +692,7 @@ static void imdct_output(TwinContext *tctx, enum FrameType ftype, int wtype, if (tctx->avctx->channels == 2) { memcpy(&out[1][0], &prev_buf[2*mtab->size], size1 * sizeof(out[1][0])); memcpy(&out[1][size1], &tctx->curr_frame[2*mtab->size], size2 * sizeof(out[1][0])); - tctx->dsp.butterflies_float(out[0], out[1], mtab->size); + tctx->fdsp.butterflies_float(out[0], out[1], mtab->size); } } @@ -1157,7 +1156,6 @@ static av_cold int twin_decode_init(AVCodecContext *avctx) return -1; } - ff_dsputil_init(&tctx->dsp, avctx); avpriv_float_dsp_init(&tctx->fdsp, avctx->flags & CODEC_FLAG_BITEXACT); if ((ret = init_mdct_win(tctx))) { av_log(avctx, AV_LOG_ERROR, "Error initializing MDCT\n"); -- cgit v1.2.3