diff options
author | Ronald S. Bultje <rsbultje@gmail.com> | 2013-03-11 00:55:07 +0400 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2013-04-20 00:18:21 +0400 |
commit | f4fed5a2f97ec843c04af6b91a86dd237a655361 (patch) | |
tree | 6a86599304ce7c9bfbc362e5adeb0afe902c726c /libavcodec/mpegvideo_motion.c | |
parent | 6caa44aa7df0ee5aba94f4cfc26a5d2cdcba8115 (diff) |
mpegvideo: Use hpeldsp instead of dsputil for half-pel functions
This also converts vc1, since that is mpegvideo-based.
Signed-off-by: Martin Storsjö <martin@martin.st>
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 a524fa3064..c8109b12d9 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){ |