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/vc1dec.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/vc1dec.c')
| -rw-r--r-- | libavcodec/vc1dec.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 6ffb0c203f..08fa3d8b91 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -523,9 +523,9 @@ static void vc1_mc_1mv(VC1Context *v, int dir) } else { // hpel mc - always used for luma dxy = (my & 2) | ((mx & 2) >> 1); if (!v->rnd) - dsp->put_pixels_tab[0][dxy](s->dest[0] + off, srcY, s->linesize, 16); + s->hdsp.put_pixels_tab[0][dxy](s->dest[0] + off, srcY, s->linesize, 16); else - dsp->put_no_rnd_pixels_tab[0][dxy](s->dest[0] + off, srcY, s->linesize, 16); + s->hdsp.put_no_rnd_pixels_tab[0][dxy](s->dest[0] + off, srcY, s->linesize, 16); } if (s->flags & CODEC_FLAG_GRAY) return; @@ -557,7 +557,6 @@ static inline int median4(int a, int b, int c, int d) static void vc1_mc_4mv_luma(VC1Context *v, int n, int dir) { MpegEncContext *s = &v->s; - DSPContext *dsp = &v->s.dsp; uint8_t *srcY; int dxy, mx, my, src_x, src_y; int off; @@ -722,9 +721,9 @@ static void vc1_mc_4mv_luma(VC1Context *v, int n, int dir) } else { // hpel mc - always used for luma dxy = (my & 2) | ((mx & 2) >> 1); if (!v->rnd) - dsp->put_pixels_tab[1][dxy](s->dest[0] + off, srcY, s->linesize, 8); + s->hdsp.put_pixels_tab[1][dxy](s->dest[0] + off, srcY, s->linesize, 8); else - dsp->put_no_rnd_pixels_tab[1][dxy](s->dest[0] + off, srcY, s->linesize, 8); + s->hdsp.put_no_rnd_pixels_tab[1][dxy](s->dest[0] + off, srcY, s->linesize, 8); } } @@ -1969,9 +1968,9 @@ static void vc1_interp_mc(VC1Context *v) dxy = (my & 2) | ((mx & 2) >> 1); if (!v->rnd) - dsp->avg_pixels_tab[0][dxy](s->dest[0] + off, srcY, s->linesize, 16); + s->hdsp.avg_pixels_tab[0][dxy](s->dest[0] + off, srcY, s->linesize, 16); else - dsp->avg_no_rnd_pixels_tab[dxy](s->dest[0] + off, srcY, s->linesize, 16); + s->hdsp.avg_no_rnd_pixels_tab[dxy](s->dest[0] + off, srcY, s->linesize, 16); } if (s->flags & CODEC_FLAG_GRAY) return; |