interplayvideo: Use hpeldsp instead of dsputil for half-pel functions
authorRonald S. Bultje <rsbultje@gmail.com>
Sun, 10 Mar 2013 19:58:02 +0000 (12:58 -0700)
committerMartin Storsjö <martin@martin.st>
Fri, 19 Apr 2013 20:18:02 +0000 (23:18 +0300)
This makes interplayvideo independent of dsputil.

Signed-off-by: Martin Storsjö <martin@martin.st>
configure
libavcodec/interplayvideo.c

index 030700a..a7e8cdf 100755 (executable)
--- a/configure
+++ b/configure
@@ -1579,7 +1579,7 @@ huffyuv_encoder_select="dsputil huffman"
 iac_decoder_select="dsputil fft mdct sinewin"
 imc_decoder_select="dsputil fft mdct sinewin"
 indeo3_decoder_select="hpeldsp"
-interplay_video_decoder_select="dsputil"
+interplay_video_decoder_select="hpeldsp"
 jpegls_decoder_select="dsputil golomb"
 jpegls_encoder_select="golomb"
 jv_decoder_select="dsputil"
index 57035fd..b76fe6d 100644 (file)
@@ -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();