diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2013-01-20 15:41:14 -0800 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2013-01-22 11:55:42 -0800 |
| commit | 5959bfaca396ecaf63a8123055f499688b79cae3 (patch) | |
| tree | a32f22fb1a5ad7ddc731e9cee13ffface840cb4a /libavcodec/mpegaudiodec.c | |
| parent | 42d324694883cdf1fff1612ac70fa403692a1ad4 (diff) | |
| download | ffmpeg-5959bfaca396ecaf63a8123055f499688b79cae3.tar.gz | |
floatdsp: move butterflies_float from dsputil to avfloatdsp.
This makes wmadec/enc, twinvq and mpegaudiodec (i.e. mp2/mp3)
independent of dsputil.
Diffstat (limited to 'libavcodec/mpegaudiodec.c')
| -rw-r--r-- | libavcodec/mpegaudiodec.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index fda0280b44..3524cff146 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -25,6 +25,7 @@ */ #include "libavutil/channel_layout.h" +#include "libavutil/float_dsp.h" #include "avcodec.h" #include "get_bits.h" #include "internal.h" @@ -82,7 +83,7 @@ typedef struct MPADecodeContext { int err_recognition; AVCodecContext* avctx; MPADSPContext mpadsp; - DSPContext dsp; + AVFloatDSPContext fdsp; AVFrame frame; } MPADecodeContext; @@ -434,8 +435,8 @@ static av_cold int decode_init(AVCodecContext * avctx) s->avctx = avctx; + avpriv_float_dsp_init(&s->fdsp, avctx->flags & CODEC_FLAG_BITEXACT); ff_mpadsp_init(&s->mpadsp); - ff_dsputil_init(&s->dsp, avctx); if (avctx->request_sample_fmt == OUT_FMT && avctx->codec_id != AV_CODEC_ID_MP3ON4) @@ -1157,7 +1158,7 @@ found2: /* NOTE: the 1/sqrt(2) normalization factor is included in the global gain */ #if CONFIG_FLOAT - s-> dsp.butterflies_float(g0->sb_hybrid, g1->sb_hybrid, 576); + s->fdsp.butterflies_float(g0->sb_hybrid, g1->sb_hybrid, 576); #else tab0 = g0->sb_hybrid; tab1 = g1->sb_hybrid; |