diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-01-14 10:33:47 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-06-18 14:07:23 -0700 |
| commit | e74433a8e6fc00c8dbde293c97a3e45384c2c1d9 (patch) | |
| tree | f975b37a58a7c6e62c84c12349610ce6f40ad4d1 /libavcodec/jvdec.c | |
| parent | 869fc416f7c78ed4e397e0208acd1545771c0502 (diff) | |
| download | ffmpeg-e74433a8e6fc00c8dbde293c97a3e45384c2c1d9.tar.gz | |
dsputil: Split clear_block*/fill_block* off into a separate context
Diffstat (limited to 'libavcodec/jvdec.c')
| -rw-r--r-- | libavcodec/jvdec.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/jvdec.c b/libavcodec/jvdec.c index 662a94492d..bb347e045a 100644 --- a/libavcodec/jvdec.c +++ b/libavcodec/jvdec.c @@ -28,12 +28,12 @@ #include "libavutil/intreadwrite.h" #include "avcodec.h" -#include "dsputil.h" +#include "blockdsp.h" #include "get_bits.h" #include "internal.h" typedef struct JvContext { - DSPContext dsp; + BlockDSPContext bdsp; AVFrame *frame; uint32_t palette[AVPALETTE_COUNT]; int palette_has_changed; @@ -48,7 +48,7 @@ static av_cold int decode_init(AVCodecContext *avctx) return AVERROR(ENOMEM); avctx->pix_fmt = AV_PIX_FMT_PAL8; - ff_dsputil_init(&s->dsp, avctx); + ff_blockdsp_init(&s->bdsp, avctx); return 0; } @@ -113,14 +113,14 @@ static inline void decode4x4(GetBitContext *gb, uint8_t *dst, int linesize) * Decode 8x8 block */ static inline void decode8x8(GetBitContext *gb, uint8_t *dst, int linesize, - DSPContext *dsp) + BlockDSPContext *bdsp) { int i, j, v[2]; switch (get_bits(gb, 2)) { case 1: v[0] = get_bits(gb, 8); - dsp->fill_block_tab[1](dst, v[0], linesize, 8); + bdsp->fill_block_tab[1](dst, v[0], linesize, 8); break; case 2: v[0] = get_bits(gb, 8); @@ -163,7 +163,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, for (i = 0; i < avctx->width; i += 8) decode8x8(&gb, s->frame->data[0] + j * s->frame->linesize[0] + i, - s->frame->linesize[0], &s->dsp); + s->frame->linesize[0], &s->bdsp); buf += video_size; } else if (video_type == 2) { |