summaryrefslogtreecommitdiffstats
path: root/libavcodec/mimic.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2014-01-24 11:55:16 +0100
committerDiego Biurrun <diego@biurrun.de>2014-06-30 07:58:46 -0700
commite3fcb14347466095839c2a3c47ebecff02da891e (patch)
tree38fbcef2c592faae3610887dbda3ab333181d1dc /libavcodec/mimic.c
parentadcb8392c9b185fd8a91a95fa256d15ab1432a30 (diff)
downloadffmpeg-streaming-e3fcb14347466095839c2a3c47ebecff02da891e.zip
ffmpeg-streaming-e3fcb14347466095839c2a3c47ebecff02da891e.tar.gz
dsputil: Split off IDCT bits into their own context
Diffstat (limited to 'libavcodec/mimic.c')
-rw-r--r--libavcodec/mimic.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c
index 4d21b51..88ee5d3 100644
--- a/libavcodec/mimic.c
+++ b/libavcodec/mimic.c
@@ -29,8 +29,8 @@
#include "get_bits.h"
#include "bytestream.h"
#include "bswapdsp.h"
-#include "dsputil.h"
#include "hpeldsp.h"
+#include "idctdsp.h"
#include "thread.h"
#define MIMIC_HEADER_SIZE 20
@@ -56,8 +56,8 @@ typedef struct {
ScanTable scantable;
BlockDSPContext bdsp;
BswapDSPContext bbdsp;
- DSPContext dsp;
HpelDSPContext hdsp;
+ IDCTDSPContext idsp;
VLC vlc;
/* Kept in the context so multithreading can have a constant to read from */
@@ -151,9 +151,9 @@ static av_cold int mimic_decode_init(AVCodecContext *avctx)
}
ff_blockdsp_init(&ctx->bdsp, avctx);
ff_bswapdsp_init(&ctx->bbdsp);
- ff_dsputil_init(&ctx->dsp, avctx);
ff_hpeldsp_init(&ctx->hdsp, avctx->flags);
- ff_init_scantable(ctx->dsp.idct_permutation, &ctx->scantable, col_zag);
+ ff_idctdsp_init(&ctx->idsp, avctx);
+ ff_init_scantable(ctx->idsp.idct_permutation, &ctx->scantable, col_zag);
for (i = 0; i < FF_ARRAY_ELEMS(ctx->frames); i++) {
ctx->frames[i].f = av_frame_alloc();
@@ -302,7 +302,7 @@ static int decode(MimicContext *ctx, int quality, int num_coeffs,
"block.\n");
return ret;
}
- ctx->dsp.idct_put(dst, stride, ctx->dct_block);
+ ctx->idsp.idct_put(dst, stride, ctx->dct_block);
} else {
unsigned int backref = get_bits(&ctx->gb, 4);
int index = (ctx->cur_index + backref) & 15;
OpenPOWER on IntegriCloud