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 /libavfilter/vf_spp.c | |
| parent | 5c7bf354dc0c8bea6e7af21c0bc2edad92974274 (diff) | |
| parent | a9aee08d900f686e966c64afec5d88a7d9d130a3 (diff) | |
| download | ffmpeg-streaming-14e2406de7d211d50fcce0059c90103bdaa947aa.zip ffmpeg-streaming-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 'libavfilter/vf_spp.c')
| -rw-r--r-- | libavfilter/vf_spp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavfilter/vf_spp.c b/libavfilter/vf_spp.c index 5c4ebdc..9df87ff 100644 --- a/libavfilter/vf_spp.c +++ b/libavfilter/vf_spp.c @@ -233,7 +233,7 @@ static void filter(SPPContext *p, uint8_t *dst, uint8_t *src, const int y1 = y + offset[i + count - 1][1]; const int index = x1 + y1*linesize; p->dsp.get_pixels(block, p->src + index, linesize); - p->dsp.fdct(block); + p->fdsp.fdct(block); p->requantize(block2, block, qp, p->idsp.idct_permutation); p->idsp.idct(block2); add_block(p->temp + index, linesize, block2); @@ -382,6 +382,7 @@ static av_cold int init(AVFilterContext *ctx) return AVERROR(ENOMEM); avpriv_dsputil_init(&spp->dsp, spp->avctx); ff_idctdsp_init(&spp->idsp, spp->avctx); + ff_fdctdsp_init(&spp->fdsp, spp->avctx); spp->store_slice = store_slice_c; switch (spp->mode) { case MODE_HARD: spp->requantize = hardthresh_c; break; |
