diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-08 03:12:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-08 03:19:06 +0200 |
| commit | 14e2406de7d211d50fcce0059c90103bdaa947aa (patch) | |
| tree | 10e20cd60b4f4bc91d14957b9565871cdd0381c3 /libavcodec/dnxhdenc.c | |
| parent | 5c7bf354dc0c8bea6e7af21c0bc2edad92974274 (diff) | |
| parent | a9aee08d900f686e966c64afec5d88a7d9d130a3 (diff) | |
| download | ffmpeg-14e2406de7d211d50fcce0059c90103bdaa947aa.tar.gz | |
Merge commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3'
* commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3':
dsputil: Split off FDCT bits into their own context
Conflicts:
configure
libavcodec/Makefile
libavcodec/asvenc.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/x86/Makefile
libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dnxhdenc.c')
| -rw-r--r-- | libavcodec/dnxhdenc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 45b882da40..f6f9af833a 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -31,6 +31,7 @@ #include "avcodec.h" #include "blockdsp.h" #include "dsputil.h" +#include "fdctdsp.h" #include "internal.h" #include "mpegvideo.h" #include "dnxhdenc.h" @@ -109,7 +110,7 @@ static int dnxhd_10bit_dct_quantize(MpegEncContext *ctx, int16_t *block, int last_non_zero = 0; int i; - ctx->dsp.fdct(block); + ctx->fdsp.fdct(block); // Divide by 4 with rounding, to compensate scaling of DCT coefficients block[0] = (block[0] + 2) >> 2; @@ -322,6 +323,7 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx) avctx->bits_per_raw_sample = ctx->cid_table->bit_depth; ff_blockdsp_init(&ctx->bdsp, avctx); + ff_fdctdsp_init(&ctx->m.fdsp, avctx); ff_idctdsp_init(&ctx->m.idsp, avctx); ff_mpegvideoencdsp_init(&ctx->m.mpvencdsp, avctx); ff_dct_common_init(&ctx->m); |