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/imc.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/imc.c')
| -rw-r--r-- | libavcodec/imc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/imc.c b/libavcodec/imc.c index 1295c8ec6c..a09e3c5d9f 100644 --- a/libavcodec/imc.c +++ b/libavcodec/imc.c @@ -36,6 +36,7 @@ #include <stdio.h> #include "libavutil/channel_layout.h" +#include "libavutil/float_dsp.h" #include "libavutil/libm.h" #include "avcodec.h" #include "get_bits.h" @@ -96,6 +97,7 @@ typedef struct { GetBitContext gb; DSPContext dsp; + AVFloatDSPContext fdsp; FFTContext fft; DECLARE_ALIGNED(32, FFTComplex, samples)[COEFFS / 2]; float *out_samples; @@ -245,6 +247,7 @@ static av_cold int imc_decode_init(AVCodecContext *avctx) return ret; } ff_dsputil_init(&q->dsp, avctx); + avpriv_float_dsp_init(&q->fdsp, avctx->flags & CODEC_FLAG_BITEXACT); avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; avctx->channel_layout = avctx->channels == 1 ? AV_CH_LAYOUT_MONO : AV_CH_LAYOUT_STEREO; @@ -967,8 +970,8 @@ static int imc_decode_frame(AVCodecContext *avctx, void *data, } if (avctx->channels == 2) { - q->dsp.butterflies_float((float *)q->frame.extended_data[0], - (float *)q->frame.extended_data[1], COEFFS); + q->fdsp.butterflies_float((float *)q->frame.extended_data[0], + (float *)q->frame.extended_data[1], COEFFS); } *got_frame_ptr = 1; |