diff options
author | Diego Biurrun <diego@biurrun.de> | 2013-12-30 22:56:07 +0400 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2014-07-07 01:26:53 +0400 |
commit | c166148409fe8f0dbccef2fe684286a40ba1e37d (patch) | |
tree | 64db33e2555b5e96635f684c2a6e3959bf0d7de7 /libavcodec/dnxhdenc.c | |
parent | 8d686ca59db14900ad5c12b547fb8a7afc8b0b94 (diff) |
dsputil: Move pix_sum, pix_norm1, shrink function pointers to mpegvideoenc
Diffstat (limited to 'libavcodec/dnxhdenc.c')
-rw-r--r-- | libavcodec/dnxhdenc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 223791acbf..f3c291fa7c 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -309,6 +309,7 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx) ff_blockdsp_init(&ctx->bdsp, avctx); ff_dsputil_init(&ctx->m.dsp, avctx); ff_idctdsp_init(&ctx->m.idsp, avctx); + ff_mpegvideoencdsp_init(&ctx->m.mpvencdsp, avctx); ff_dct_common_init(&ctx->m); if (!ctx->m.dct_quantize) ctx->m.dct_quantize = ff_dct_quantize_c; @@ -719,8 +720,8 @@ static int dnxhd_mb_var_thread(AVCodecContext *avctx, void *arg, int varc; if (!partial_last_row && mb_x * 16 <= avctx->width - 16) { - sum = ctx->m.dsp.pix_sum(pix, ctx->m.linesize); - varc = ctx->m.dsp.pix_norm1(pix, ctx->m.linesize); + sum = ctx->m.mpvencdsp.pix_sum(pix, ctx->m.linesize); + varc = ctx->m.mpvencdsp.pix_norm1(pix, ctx->m.linesize); } else { int bw = FFMIN(avctx->width - 16 * mb_x, 16); int bh = FFMIN((avctx->height >> ctx->interlaced) - 16 * mb_y, 16); |