aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mpc7.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2014-02-13 17:57:05 +0100
committerDiego Biurrun <diego@biurrun.de>2014-06-22 18:22:31 -0700
commitc67b449bebbe0b35c73b203683e77a0a649bc765 (patch)
treefef2691cbb548198024dbc1461419dfdd9d3fea2 /libavcodec/mpc7.c
parent7b9ef8d701c319c26f7d0664fe977e176764c74e (diff)
downloadffmpeg-c67b449bebbe0b35c73b203683e77a0a649bc765.tar.gz
dsputil: Split bswap*_buf() off into a separate context
Diffstat (limited to 'libavcodec/mpc7.c')
-rw-r--r--libavcodec/mpc7.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/mpc7.c b/libavcodec/mpc7.c
index a38b0ea595..2185aec88b 100644
--- a/libavcodec/mpc7.c
+++ b/libavcodec/mpc7.c
@@ -30,7 +30,6 @@
#include "libavutil/lfg.h"
#include "avcodec.h"
#include "get_bits.h"
-#include "dsputil.h"
#include "internal.h"
#include "mpegaudiodsp.h"
@@ -75,9 +74,9 @@ static av_cold int mpc7_decode_init(AVCodecContext * avctx)
}
memset(c->oldDSCF, 0, sizeof(c->oldDSCF));
av_lfg_init(&c->rnd, 0xDEADBEEF);
- ff_dsputil_init(&c->dsp, avctx);
+ ff_bswapdsp_init(&c->bdsp);
ff_mpadsp_init(&c->mpadsp);
- c->dsp.bswap_buf((uint32_t*)buf, (const uint32_t*)avctx->extradata, 4);
+ c->bdsp.bswap_buf((uint32_t *) buf, (const uint32_t *) avctx->extradata, 4);
ff_mpc_init();
init_get_bits(&gb, buf, 128);
@@ -236,7 +235,8 @@ static int mpc7_decode_frame(AVCodecContext * avctx, void *data,
av_fast_padded_malloc(&c->bits, &c->buf_size, buf_size);
if (!c->bits)
return AVERROR(ENOMEM);
- c->dsp.bswap_buf((uint32_t *)c->bits, (const uint32_t *)buf, buf_size >> 2);
+ c->bdsp.bswap_buf((uint32_t *) c->bits, (const uint32_t *) buf,
+ buf_size >> 2);
init_get_bits(&gb, c->bits, buf_size * 8);
skip_bits_long(&gb, skip);