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/asvenc.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/asvenc.c')
| -rw-r--r-- | libavcodec/asvenc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/asvenc.c b/libavcodec/asvenc.c index c27e652efe..ae81953f30 100644 --- a/libavcodec/asvenc.c +++ b/libavcodec/asvenc.c @@ -28,6 +28,7 @@ #include "asv.h" #include "avcodec.h" +#include "fdctdsp.h" #include "internal.h" #include "mathops.h" #include "mpeg12data.h" @@ -164,13 +165,13 @@ static inline void dct_get(ASV1Context *a, const AVFrame *frame, a->dsp.get_pixels(block[2], ptr_y + 8*linesize , linesize); a->dsp.get_pixels(block[3], ptr_y + 8*linesize + 8, linesize); for(i=0; i<4; i++) - a->dsp.fdct(block[i]); + a->fdsp.fdct(block[i]); if(!(a->avctx->flags&CODEC_FLAG_GRAY)){ a->dsp.get_pixels(block[4], ptr_cb, frame->linesize[1]); a->dsp.get_pixels(block[5], ptr_cr, frame->linesize[2]); for(i=4; i<6; i++) - a->dsp.fdct(block[i]); + a->fdsp.fdct(block[i]); } } @@ -282,6 +283,7 @@ static av_cold int encode_init(AVCodecContext *avctx){ ff_asv_common_init(avctx); ff_dsputil_init(&a->dsp, avctx); + ff_fdctdsp_init(&a->fdsp, avctx); if(avctx->global_quality <= 0) avctx->global_quality= 4*FF_QUALITY_SCALE; |