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/fraps.c | |
| parent | 7b9ef8d701c319c26f7d0664fe977e176764c74e (diff) | |
| download | ffmpeg-c67b449bebbe0b35c73b203683e77a0a649bc765.tar.gz | |
dsputil: Split bswap*_buf() off into a separate context
Diffstat (limited to 'libavcodec/fraps.c')
| -rw-r--r-- | libavcodec/fraps.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/fraps.c b/libavcodec/fraps.c index 1005a56780..4b4b02cc51 100644 --- a/libavcodec/fraps.c +++ b/libavcodec/fraps.c @@ -35,7 +35,7 @@ #include "get_bits.h" #include "huffman.h" #include "bytestream.h" -#include "dsputil.h" +#include "bswapdsp.h" #include "internal.h" #define FPS_TAG MKTAG('F', 'P', 'S', 'x') @@ -45,10 +45,10 @@ */ typedef struct FrapsContext { AVCodecContext *avctx; + BswapDSPContext bdsp; AVFrame *frame; uint8_t *tmpbuf; int tmpbuf_size; - DSPContext dsp; } FrapsContext; @@ -70,7 +70,7 @@ static av_cold int decode_init(AVCodecContext *avctx) if (!s->frame) return AVERROR(ENOMEM); - ff_dsputil_init(&s->dsp, avctx); + ff_bswapdsp_init(&s->bdsp); return 0; } @@ -106,7 +106,8 @@ static int fraps2_decode_plane(FrapsContext *s, uint8_t *dst, int stride, int w, /* we have built Huffman table and are ready to decode plane */ /* convert bits so they may be used by standard bitreader */ - s->dsp.bswap_buf((uint32_t *)s->tmpbuf, (const uint32_t *)src, size >> 2); + s->bdsp.bswap_buf((uint32_t *) s->tmpbuf, + (const uint32_t *) src, size >> 2); init_get_bits(&gb, s->tmpbuf, size * 8); for (j = 0; j < h; j++) { |