From f46bb608d9d76c543e4929dc8cffe36b84bd789e Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 3 Feb 2014 14:29:09 -0800 Subject: dsputil: Split off pixel block routines into their own context --- libavcodec/asvenc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'libavcodec/asvenc.c') diff --git a/libavcodec/asvenc.c b/libavcodec/asvenc.c index 1a7021f5a4..9944ffaa7c 100644 --- a/libavcodec/asvenc.c +++ b/libavcodec/asvenc.c @@ -159,16 +159,16 @@ static inline void dct_get(ASV1Context *a, const AVFrame *frame, uint8_t *ptr_cb = frame->data[1] + (mb_y * 8 * frame->linesize[1]) + mb_x * 8; uint8_t *ptr_cr = frame->data[2] + (mb_y * 8 * frame->linesize[2]) + mb_x * 8; - a->dsp.get_pixels(block[0], ptr_y , linesize); - a->dsp.get_pixels(block[1], ptr_y + 8, linesize); - a->dsp.get_pixels(block[2], ptr_y + 8*linesize , linesize); - a->dsp.get_pixels(block[3], ptr_y + 8*linesize + 8, linesize); + a->pdsp.get_pixels(block[0], ptr_y, linesize); + a->pdsp.get_pixels(block[1], ptr_y + 8, linesize); + a->pdsp.get_pixels(block[2], ptr_y + 8 * linesize, linesize); + a->pdsp.get_pixels(block[3], ptr_y + 8 * linesize + 8, linesize); for(i=0; i<4; i++) a->fdsp.fdct(block[i]); if(!(a->avctx->flags&CODEC_FLAG_GRAY)){ - a->dsp.get_pixels(block[4], ptr_cb, frame->linesize[1]); - a->dsp.get_pixels(block[5], ptr_cr, frame->linesize[2]); + a->pdsp.get_pixels(block[4], ptr_cb, frame->linesize[1]); + a->pdsp.get_pixels(block[5], ptr_cr, frame->linesize[2]); for(i=4; i<6; i++) a->fdsp.fdct(block[i]); } @@ -248,8 +248,8 @@ static av_cold int encode_init(AVCodecContext *avctx){ avctx->coded_frame->key_frame = 1; ff_asv_common_init(avctx); - ff_dsputil_init(&a->dsp, avctx); ff_fdctdsp_init(&a->fdsp, avctx); + ff_pixblockdsp_init(&a->pdsp, avctx); if(avctx->global_quality == 0) avctx->global_quality= 4*FF_QUALITY_SCALE; -- cgit v1.2.3