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/rawdec.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/rawdec.c')
| -rw-r--r-- | libavcodec/rawdec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index a03b1be9fe..ee1f3970ad 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -25,7 +25,7 @@ */ #include "avcodec.h" -#include "dsputil.h" +#include "bswapdsp.h" #include "get_bits.h" #include "internal.h" #include "raw.h" @@ -46,7 +46,7 @@ typedef struct RawVideoContext { int is_lt_16bpp; // 16bpp pixfmt and bits_per_coded_sample < 16 int tff; - DSPContext dsp; + BswapDSPContext bbdsp; void *bitstream_buf; unsigned int bitstream_buf_size; } RawVideoContext; @@ -74,7 +74,7 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx) RawVideoContext *context = avctx->priv_data; const AVPixFmtDescriptor *desc; - ff_dsputil_init(&context->dsp, avctx); + ff_bswapdsp_init(&context->bbdsp); if ( avctx->codec_tag == MKTAG('r','a','w',' ') || avctx->codec_tag == MKTAG('N','O','1','6')) @@ -237,9 +237,9 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame, if (!context->bitstream_buf) return AVERROR(ENOMEM); if (swap == 16) - context->dsp.bswap16_buf(context->bitstream_buf, (const uint16_t*)buf, buf_size / 2); + context->bbdsp.bswap16_buf(context->bitstream_buf, (const uint16_t*)buf, buf_size / 2); else if (swap == 32) - context->dsp.bswap_buf(context->bitstream_buf, (const uint32_t*)buf, buf_size / 4); + context->bbdsp.bswap_buf(context->bitstream_buf, (const uint32_t*)buf, buf_size / 4); else return AVERROR_INVALIDDATA; buf = context->bitstream_buf; |