diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-19 04:41:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-19 04:54:38 +0200 |
| commit | 2b05db4f8102148d013755ac2a7e47f6d79ff7ca (patch) | |
| tree | 8135823ee5f9db622126672b644e06c243ae3c01 /libavcodec/mimic.c | |
| parent | ab12373956e92b865bced9b05b12971f062cfd3e (diff) | |
| parent | e74433a8e6fc00c8dbde293c97a3e45384c2c1d9 (diff) | |
Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'
* commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9':
dsputil: Split clear_block*/fill_block* off into a separate context
Conflicts:
configure
libavcodec/asvdec.c
libavcodec/dnxhddec.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.h
libavcodec/eamad.c
libavcodec/intrax8.c
libavcodec/mjpegdec.c
libavcodec/ppc/dsputil_ppc.c
libavcodec/vc1dec.c
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mimic.c')
| -rw-r--r-- | libavcodec/mimic.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c index 31d63931a2..7b981151fc 100644 --- a/libavcodec/mimic.c +++ b/libavcodec/mimic.c @@ -24,6 +24,7 @@ #include <stdint.h> #include "avcodec.h" +#include "blockdsp.h" #include "internal.h" #include "get_bits.h" #include "bytestream.h" @@ -52,6 +53,7 @@ typedef struct { GetBitContext gb; ScanTable scantable; + BlockDSPContext bdsp; DSPContext dsp; HpelDSPContext hdsp; VLC vlc; @@ -146,6 +148,7 @@ static av_cold int mimic_decode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_ERROR, "error initializing vlc table\n"); return ret; } + ff_blockdsp_init(&ctx->bdsp, avctx); ff_dsputil_init(&ctx->dsp, avctx); ff_hpeldsp_init(&ctx->hdsp, avctx->flags); ff_init_scantable(ctx->dsp.idct_permutation, &ctx->scantable, col_zag); @@ -228,7 +231,7 @@ static int vlc_decode_block(MimicContext *ctx, int num_coeffs, int qscale) int16_t *block = ctx->dct_block; unsigned int pos; - ctx->dsp.clear_block(block); + ctx->bdsp.clear_block(block); block[0] = get_bits(&ctx->gb, 8) << 3; |