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/flacenc.c | |
| parent | 7b9ef8d701c319c26f7d0664fe977e176764c74e (diff) | |
dsputil: Split bswap*_buf() off into a separate context
Diffstat (limited to 'libavcodec/flacenc.c')
| -rw-r--r-- | libavcodec/flacenc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c index 9138b9953f..1160da2ecd 100644 --- a/libavcodec/flacenc.c +++ b/libavcodec/flacenc.c @@ -24,7 +24,7 @@ #include "libavutil/md5.h" #include "libavutil/opt.h" #include "avcodec.h" -#include "dsputil.h" +#include "bswapdsp.h" #include "get_bits.h" #include "golomb.h" #include "internal.h" @@ -112,7 +112,7 @@ typedef struct FlacEncodeContext { struct AVMD5 *md5ctx; uint8_t *md5_buffer; unsigned int md5_buffer_size; - DSPContext dsp; + BswapDSPContext bdsp; FLACDSPContext flac_dsp; int flushed; @@ -400,7 +400,7 @@ static av_cold int flac_encode_init(AVCodecContext *avctx) ret = ff_lpc_init(&s->lpc_ctx, avctx->frame_size, s->options.max_prediction_order, FF_LPC_TYPE_LEVINSON); - ff_dsputil_init(&s->dsp, avctx); + ff_bswapdsp_init(&s->bdsp); ff_flacdsp_init(&s->flac_dsp, avctx->sample_fmt, avctx->bits_per_raw_sample); @@ -1179,8 +1179,8 @@ static int update_md5_sum(FlacEncodeContext *s, const void *samples) if (s->avctx->bits_per_raw_sample <= 16) { buf = (const uint8_t *)samples; #if HAVE_BIGENDIAN - s->dsp.bswap16_buf((uint16_t *)s->md5_buffer, - (const uint16_t *)samples, buf_size / 2); + s->bdsp.bswap16_buf((uint16_t *) s->md5_buffer, + (const uint16_t *) samples, buf_size / 2); buf = s->md5_buffer; #endif } else { |