diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2013-03-10 12:58:02 -0700 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 03:57:21 +0100 |
| commit | 04a75bb74f5db7463e9bb0453a2f7bfd54d1dc07 (patch) | |
| tree | ead2c4de0825acfb9ca099d51f8fb1dff4e3e61d /libavcodec/interplayvideo.c | |
| parent | af1e3dfb9eaf8c9ab0b6b34e330341ce8c45c652 (diff) | |
interplayvideo: use hpeldsp instead of dsputil for half-pel functions.
This makes interplayvideo independent of dsputil.
Diffstat (limited to 'libavcodec/interplayvideo.c')
| -rw-r--r-- | libavcodec/interplayvideo.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c index 3647c80757..5c43a785d5 100644 --- a/libavcodec/interplayvideo.c +++ b/libavcodec/interplayvideo.c @@ -40,7 +40,7 @@ #include "avcodec.h" #include "bytestream.h" -#include "dsputil.h" +#include "hpeldsp.h" #define BITSTREAM_READER_LE #include "get_bits.h" #include "internal.h" @@ -50,7 +50,7 @@ typedef struct IpvideoContext { AVCodecContext *avctx; - DSPContext dsp; + HpelDSPContext hdsp; AVFrame *second_last_frame; AVFrame *last_frame; const unsigned char *decoding_map; @@ -83,8 +83,8 @@ static int copy_from(IpvideoContext *s, AVFrame *src, AVFrame *dst, int delta_x, av_log(s->avctx, AV_LOG_ERROR, "Invalid decode type, corrupted header?\n"); return AVERROR(EINVAL); } - s->dsp.put_pixels_tab[!s->is_16bpp][0](s->pixel_ptr, src->data[0] + motion_offset, - dst->linesize[0], 8); + s->hdsp.put_pixels_tab[!s->is_16bpp][0](s->pixel_ptr, src->data[0] + motion_offset, + dst->linesize[0], 8); return 0; } @@ -939,7 +939,7 @@ static av_cold int ipvideo_decode_init(AVCodecContext *avctx) s->is_16bpp = avctx->bits_per_coded_sample == 16; avctx->pix_fmt = s->is_16bpp ? AV_PIX_FMT_RGB555 : AV_PIX_FMT_PAL8; - ff_dsputil_init(&s->dsp, avctx); + ff_hpeldsp_init(&s->hdsp, avctx->flags); s->last_frame = av_frame_alloc(); s->second_last_frame = av_frame_alloc(); |