diff options
author | Ronald S. Bultje <rsbultje@gmail.com> | 2013-03-10 13:55:07 -0700 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 03:58:00 +0100 |
commit | 4ba5dbc0e4dc8737c71af77b6a5a905d6de2b76b (patch) | |
tree | 9022230c0b60013c132020a1c260ab63f1924ea0 /libavcodec/mpegvideo_motion.c | |
parent | 46523897774cc0a748dab3be66df9b4cacc7233f (diff) | |
download | ffmpeg-4ba5dbc0e4dc8737c71af77b6a5a905d6de2b76b.tar.gz |
mpegvideo: use hpeldsp instead of dsputil for half-pel functions.
This also converts vc1, since that is mpegvideo-based.
Diffstat (limited to 'libavcodec/mpegvideo_motion.c')
-rw-r--r-- | libavcodec/mpegvideo_motion.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/mpegvideo_motion.c b/libavcodec/mpegvideo_motion.c index 8b77e73847..beb4d6cda3 100644 --- a/libavcodec/mpegvideo_motion.c +++ b/libavcodec/mpegvideo_motion.c @@ -75,9 +75,9 @@ static void gmc1_motion(MpegEncContext *s, dxy= ((motion_x>>3)&1) | ((motion_y>>2)&2); if (s->no_rounding){ - s->dsp.put_no_rnd_pixels_tab[0][dxy](dest_y, ptr, linesize, 16); + s->hdsp.put_no_rnd_pixels_tab[0][dxy](dest_y, ptr, linesize, 16); }else{ - s->dsp.put_pixels_tab [0][dxy](dest_y, ptr, linesize, 16); + s->hdsp.put_pixels_tab [0][dxy](dest_y, ptr, linesize, 16); } } @@ -853,7 +853,7 @@ static av_always_inline void MPV_motion_internal(MpegEncContext *s, s->mv[dir][2*i + j][0], s->mv[dir][2*i + j][1], 8, mb_y); } - pix_op = s->dsp.avg_pixels_tab; + pix_op = s->hdsp.avg_pixels_tab; } }else{ for(i=0; i<2; i++){ @@ -863,7 +863,7 @@ static av_always_inline void MPV_motion_internal(MpegEncContext *s, s->mv[dir][2*i][0],s->mv[dir][2*i][1],16, mb_y>>1); // after put we make avg of the same block - pix_op=s->dsp.avg_pixels_tab; + pix_op=s->hdsp.avg_pixels_tab; //opposite parity is always in the same frame if this is second field if(!s->first_field){ |