From c166148409fe8f0dbccef2fe684286a40ba1e37d Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 30 Dec 2013 19:56:07 +0100 Subject: dsputil: Move pix_sum, pix_norm1, shrink function pointers to mpegvideoenc --- libavcodec/motion_est.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libavcodec/motion_est.c') diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index 9677e04b3e..a8a93b73e8 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -881,8 +881,9 @@ void ff_estimate_p_frame_motion(MpegEncContext * s, /* intra / predictive decision */ pix = c->src[0][0]; - sum = s->dsp.pix_sum(pix, s->linesize); - varc = s->dsp.pix_norm1(pix, s->linesize) - (((unsigned)sum*sum)>>8) + 500; + sum = s->mpvencdsp.pix_sum(pix, s->linesize); + varc = s->mpvencdsp.pix_norm1(pix, s->linesize) - + (((unsigned) sum * sum) >> 8) + 500; pic->mb_mean[s->mb_stride * mb_y + mb_x] = (sum+128)>>8; pic->mb_var [s->mb_stride * mb_y + mb_x] = (varc+128)>>8; -- cgit v1.2.3