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/dvenc.c | |
| parent | 5c7bf354dc0c8bea6e7af21c0bc2edad92974274 (diff) | |
| parent | a9aee08d900f686e966c64afec5d88a7d9d130a3 (diff) | |
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/dvenc.c')
| -rw-r--r-- | libavcodec/dvenc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c index d1e7707b02..b01122eacc 100644 --- a/libavcodec/dvenc.c +++ b/libavcodec/dvenc.c @@ -29,6 +29,7 @@ #include "config.h" #include "avcodec.h" #include "dsputil.h" +#include "fdctdsp.h" #include "internal.h" #include "put_bits.h" #include "dv.h" @@ -38,6 +39,7 @@ static av_cold int dvvideo_encode_init(AVCodecContext *avctx) { DVVideoContext *s = avctx->priv_data; DSPContext dsp; + FDCTDSPContext fdsp; int ret; s->sys = avpriv_dv_codec_profile(avctx); @@ -66,13 +68,14 @@ static av_cold int dvvideo_encode_init(AVCodecContext *avctx) memset(&dsp,0, sizeof(dsp)); ff_dsputil_init(&dsp, avctx); + ff_fdctdsp_init(&fdsp, avctx); ff_set_cmp(&dsp, dsp.ildct_cmp, avctx->ildct_cmp); s->get_pixels = dsp.get_pixels; s->ildct_cmp = dsp.ildct_cmp[5]; - s->fdct[0] = dsp.fdct; - s->fdct[1] = dsp.fdct248; + s->fdct[0] = fdsp.fdct; + s->fdct[1] = fdsp.fdct248; return ff_dvvideo_init(avctx); } |