diff options
| author | Diego Biurrun <diego@biurrun.de> | 2013-12-30 19:56:07 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-07-06 14:26:53 -0700 |
| commit | c166148409fe8f0dbccef2fe684286a40ba1e37d (patch) | |
| tree | 64db33e2555b5e96635f684c2a6e3959bf0d7de7 /libavcodec/motion_est.c | |
| parent | 8d686ca59db14900ad5c12b547fb8a7afc8b0b94 (diff) | |
| download | ffmpeg-c166148409fe8f0dbccef2fe684286a40ba1e37d.tar.gz | |
dsputil: Move pix_sum, pix_norm1, shrink function pointers to mpegvideoenc
Diffstat (limited to 'libavcodec/motion_est.c')
| -rw-r--r-- | libavcodec/motion_est.c | 5 |
1 files changed, 3 insertions, 2 deletions
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; |