From e74433a8e6fc00c8dbde293c97a3e45384c2c1d9 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 14 Jan 2014 10:33:47 +0100 Subject: dsputil: Split clear_block*/fill_block* off into a separate context --- libavcodec/dnxhdenc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'libavcodec/dnxhdenc.c') diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 4b06f6cc03..c637415187 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -29,6 +29,7 @@ #include "libavutil/timer.h" #include "avcodec.h" +#include "blockdsp.h" #include "dsputil.h" #include "internal.h" #include "mpegvideo.h" @@ -305,6 +306,7 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx) avctx->bits_per_raw_sample = ctx->cid_table->bit_depth; + ff_blockdsp_init(&ctx->bdsp, avctx); ff_dsputil_init(&ctx->m.dsp, avctx); ff_dct_common_init(&ctx->m); if (!ctx->m.dct_quantize) @@ -556,10 +558,10 @@ void dnxhd_get_blocks(DNXHDEncContext *ctx, int mb_x, int mb_y) ptr_v + ctx->dct_uv_offset, ctx->m.uvlinesize); } else { - dsp->clear_block(ctx->blocks[4]); - dsp->clear_block(ctx->blocks[5]); - dsp->clear_block(ctx->blocks[6]); - dsp->clear_block(ctx->blocks[7]); + ctx->bdsp.clear_block(ctx->blocks[4]); + ctx->bdsp.clear_block(ctx->blocks[5]); + ctx->bdsp.clear_block(ctx->blocks[6]); + ctx->bdsp.clear_block(ctx->blocks[7]); } } else { dsp->get_pixels(ctx->blocks[4], -- cgit v1.2.3