diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-01 14:38:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-01 15:22:11 +0200 |
| commit | 581b5f0b9b93969712e73e0ae6324bbd03e85d4e (patch) | |
| tree | d1319dc7744ac67e6ebd3379f11ff6e4a8178dc1 /libavcodec/mimic.c | |
| parent | 909f53f2b285bc7dbe77d4690a03f3d114417297 (diff) | |
| parent | e3fcb14347466095839c2a3c47ebecff02da891e (diff) | |
| download | ffmpeg-streaming-581b5f0b9b93969712e73e0ae6324bbd03e85d4e.zip ffmpeg-streaming-581b5f0b9b93969712e73e0ae6324bbd03e85d4e.tar.gz | |
Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'
* commit 'e3fcb14347466095839c2a3c47ebecff02da891e':
dsputil: Split off IDCT bits into their own context
Conflicts:
configure
libavcodec/aic.c
libavcodec/arm/Makefile
libavcodec/arm/dsputil_init_arm.c
libavcodec/arm/dsputil_init_armv6.c
libavcodec/asvdec.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.c
libavcodec/dvdec.c
libavcodec/dxva2_mpeg2.c
libavcodec/intrax8.c
libavcodec/mdec.c
libavcodec/mjpegdec.c
libavcodec/mjpegenc_common.h
libavcodec/mpegvideo.c
libavcodec/ppc/dsputil_altivec.h
libavcodec/ppc/dsputil_ppc.c
libavcodec/ppc/idctdsp.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mimic.c')
| -rw-r--r-- | libavcodec/mimic.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c index 3bea638..24724fa 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 */ @@ -152,9 +152,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(); @@ -303,7 +303,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; |
