diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2013-03-10 14:12:58 -0700 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 03:58:31 +0100 |
| commit | 05dd583426db7962e610bd924e840bce78abce6c (patch) | |
| tree | 5218cdcfc39c54f50246b38100388b44ee1ec5b0 /libavcodec | |
| parent | 4ba5dbc0e4dc8737c71af77b6a5a905d6de2b76b (diff) | |
| download | ffmpeg-05dd583426db7962e610bd924e840bce78abce6c.tar.gz | |
svq3: use hpeldsp instead of dsputil for half-pel functions.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/svq3.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index ac1d39f19d..53c4d3202c 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -48,6 +48,7 @@ #include "h264_mvpred.h" #include "golomb.h" +#include "hpeldsp.h" #include "rectangle.h" #include "vdpau_internal.h" @@ -65,6 +66,7 @@ typedef struct { H264Context h; + HpelDSPContext hdsp; Picture *cur_pic; Picture *next_pic; Picture *last_pic; @@ -316,9 +318,9 @@ static inline void svq3_mc_dir_part(SVQ3Context *s, : h->dsp.put_tpel_pixels_tab)[dxy](dest, src, h->linesize, width, height); else - (avg ? h->dsp.avg_pixels_tab - : h->dsp.put_pixels_tab)[blocksize][dxy](dest, src, h->linesize, - height); + (avg ? s->hdsp.avg_pixels_tab + : s->hdsp.put_pixels_tab)[blocksize][dxy](dest, src, h->linesize, + height); if (!(h->flags & CODEC_FLAG_GRAY)) { mx = mx + (mx < (int) x) >> 1; @@ -344,10 +346,10 @@ static inline void svq3_mc_dir_part(SVQ3Context *s, h->uvlinesize, width, height); else - (avg ? h->dsp.avg_pixels_tab - : h->dsp.put_pixels_tab)[blocksize][dxy](dest, src, - h->uvlinesize, - height); + (avg ? s->hdsp.avg_pixels_tab + : s->hdsp.put_pixels_tab)[blocksize][dxy](dest, src, + h->uvlinesize, + height); } } } @@ -869,6 +871,7 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx) if (ff_h264_decode_init(avctx) < 0) return -1; + ff_hpeldsp_init(&s->hdsp, avctx->flags); h->flags = avctx->flags; h->is_complex = 1; h->sps.chroma_format_idc = 1; |