diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 13:23:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 13:31:26 +0200 |
| commit | 35bb74900b951dccdc7481e98a00246f59ec2420 (patch) | |
| tree | 4e1545a104d5d0eb3194d84f9df6318841c39675 /libavcodec/cllc.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/cllc.c')
| -rw-r--r-- | libavcodec/cllc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/cllc.c b/libavcodec/cllc.c index bc8e4b5679..9c710bbb9e 100644 --- a/libavcodec/cllc.c +++ b/libavcodec/cllc.c @@ -23,14 +23,14 @@ #include <inttypes.h> #include "libavutil/intreadwrite.h" -#include "dsputil.h" +#include "bswapdsp.h" #include "get_bits.h" #include "avcodec.h" #include "internal.h" typedef struct CLLCContext { - DSPContext dsp; AVCodecContext *avctx; + BswapDSPContext bdsp; uint8_t *swapped_buf; int swapped_buf_size; @@ -391,8 +391,8 @@ static int cllc_decode_frame(AVCodecContext *avctx, void *data, } /* bswap16 the buffer since CLLC's bitreader works in 16-bit words */ - ctx->dsp.bswap16_buf((uint16_t *) ctx->swapped_buf, (uint16_t *) src, - data_size / 2); + ctx->bdsp.bswap16_buf((uint16_t *) ctx->swapped_buf, (uint16_t *) src, + data_size / 2); init_get_bits(&gb, ctx->swapped_buf, data_size * 8); @@ -476,7 +476,7 @@ static av_cold int cllc_decode_init(AVCodecContext *avctx) ctx->swapped_buf = NULL; ctx->swapped_buf_size = 0; - ff_dsputil_init(&ctx->dsp, avctx); + ff_bswapdsp_init(&ctx->bdsp); return 0; } |