diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-02-13 17:57:05 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-06-22 18:22:31 -0700 |
| commit | c67b449bebbe0b35c73b203683e77a0a649bc765 (patch) | |
| tree | fef2691cbb548198024dbc1461419dfdd9d3fea2 /libavcodec/imc.c | |
| parent | 7b9ef8d701c319c26f7d0664fe977e176764c74e (diff) | |
| download | ffmpeg-c67b449bebbe0b35c73b203683e77a0a649bc765.tar.gz | |
dsputil: Split bswap*_buf() off into a separate context
Diffstat (limited to 'libavcodec/imc.c')
| -rw-r--r-- | libavcodec/imc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/imc.c b/libavcodec/imc.c index c1fbd76fec..41ca8c8ec8 100644 --- a/libavcodec/imc.c +++ b/libavcodec/imc.c @@ -39,8 +39,8 @@ #include "libavutil/float_dsp.h" #include "libavutil/internal.h" #include "avcodec.h" +#include "bswapdsp.h" #include "get_bits.h" -#include "dsputil.h" #include "fft.h" #include "internal.h" #include "sinewin.h" @@ -94,7 +94,7 @@ typedef struct { float sqrt_tab[30]; GetBitContext gb; - DSPContext dsp; + BswapDSPContext bdsp; AVFloatDSPContext fdsp; FFTContext fft; DECLARE_ALIGNED(32, FFTComplex, samples)[COEFFS / 2]; @@ -246,7 +246,7 @@ static av_cold int imc_decode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_INFO, "FFT init failed\n"); return ret; } - ff_dsputil_init(&q->dsp, avctx); + ff_bswapdsp_init(&q->bdsp); 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 @@ -1014,7 +1014,7 @@ static int imc_decode_frame(AVCodecContext *avctx, void *data, for (i = 0; i < avctx->channels; i++) { q->out_samples = (float *)frame->extended_data[i]; - q->dsp.bswap16_buf(buf16, (const uint16_t*)buf, IMC_BLOCK_SIZE / 2); + q->bdsp.bswap16_buf(buf16, (const uint16_t *) buf, IMC_BLOCK_SIZE / 2); init_get_bits(&q->gb, (const uint8_t*)buf16, IMC_BLOCK_SIZE * 8); |