diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 15:23:41 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 15:31:26 +0400 |
commit | 35bb74900b951dccdc7481e98a00246f59ec2420 (patch) | |
tree | 4e1545a104d5d0eb3194d84f9df6318841c39675 /libavcodec/mpc7.c | |
parent | 56afbe8dbc6e508ba279bb95db542b940284fa7d (diff) | |
parent | c67b449bebbe0b35c73b203683e77a0a649bc765 (diff) |
Merge commit 'c67b449bebbe0b35c73b203683e77a0a649bc765'
* commit 'c67b449bebbe0b35c73b203683e77a0a649bc765':
dsputil: Split bswap*_buf() off into a separate context
Conflicts:
configure
libavcodec/4xm.c
libavcodec/ac3dec.c
libavcodec/ac3dec.h
libavcodec/apedec.c
libavcodec/eamad.c
libavcodec/flacenc.c
libavcodec/fraps.c
libavcodec/huffyuv.c
libavcodec/huffyuvdec.c
libavcodec/motionpixels.c
libavcodec/truemotion2.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpc7.c')
-rw-r--r-- | libavcodec/mpc7.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/mpc7.c b/libavcodec/mpc7.c index 86aca63fbc..0f1e34a8f4 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" @@ -71,9 +70,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); @@ -230,7 +229,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); |