summaryrefslogtreecommitdiff
path: root/libavcodec/indeo3.c
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2013-03-10 08:19:27 -0700
committerMichael Niedermayer <michaelni@gmx.at>2013-03-13 03:56:09 +0100
commit4b642ab19b5a4ddb404cd69f73f08ef7e0ed6bca (patch)
tree0c17e71bf9b889f33ee7a28d4516395d5fd22eaf /libavcodec/indeo3.c
parent704c9874a3851edd368f0a039e261f4e8a2535c0 (diff)
downloadffmpeg-4b642ab19b5a4ddb404cd69f73f08ef7e0ed6bca.tar.gz
indeo3: use hpeldsp instead of dsputil for half-pel functions.
This makes indeo3 independent of dsputil.
Diffstat (limited to 'libavcodec/indeo3.c')
-rw-r--r--libavcodec/indeo3.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c
index fd302a76da..629bcab316 100644
--- a/libavcodec/indeo3.c
+++ b/libavcodec/indeo3.c
@@ -33,9 +33,9 @@
#include "libavutil/intreadwrite.h"
#include "avcodec.h"
#include "copy_block.h"
-#include "dsputil.h"
#include "bytestream.h"
#include "get_bits.h"
+#include "hpeldsp.h"
#include "internal.h"
#include "indeo3data.h"
@@ -82,7 +82,7 @@ typedef struct Cell {
typedef struct Indeo3DecodeContext {
AVCodecContext *avctx;
- DSPContext dsp;
+ HpelDSPContext hdsp;
GetBitContext gb;
int need_resync;
@@ -248,12 +248,12 @@ static void copy_cell(Indeo3DecodeContext *ctx, Plane *plane, Cell *cell)
/* copy using 16xH blocks */
if (!((cell->xpos << 2) & 15) && w >= 4) {
for (; w >= 4; src += 16, dst += 16, w -= 4)
- ctx->dsp.put_no_rnd_pixels_tab[0][0](dst, src, plane->pitch, h);
+ ctx->hdsp.put_no_rnd_pixels_tab[0][0](dst, src, plane->pitch, h);
}
/* copy using 8xH blocks */
if (!((cell->xpos << 2) & 7) && w >= 2) {
- ctx->dsp.put_no_rnd_pixels_tab[1][0](dst, src, plane->pitch, h);
+ ctx->hdsp.put_no_rnd_pixels_tab[1][0](dst, src, plane->pitch, h);
w -= 2;
src += 8;
dst += 8;
@@ -1050,7 +1050,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
build_requant_tab();
- ff_dsputil_init(&ctx->dsp, avctx);
+ ff_hpeldsp_init(&ctx->hdsp, avctx->flags);
return allocate_frame_buffers(ctx, avctx, avctx->width, avctx->height);
}