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 /libavfilter | |
| parent | 909f53f2b285bc7dbe77d4690a03f3d114417297 (diff) | |
| parent | e3fcb14347466095839c2a3c47ebecff02da891e (diff) | |
| download | ffmpeg-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 'libavfilter')
| -rw-r--r-- | libavfilter/vf_spp.c | 5 | ||||
| -rw-r--r-- | libavfilter/vf_spp.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libavfilter/vf_spp.c b/libavfilter/vf_spp.c index ba0104bd33..5c4ebdcc03 100644 --- a/libavfilter/vf_spp.c +++ b/libavfilter/vf_spp.c @@ -234,8 +234,8 @@ static void filter(SPPContext *p, uint8_t *dst, uint8_t *src, const int index = x1 + y1*linesize; p->dsp.get_pixels(block, p->src + index, linesize); p->dsp.fdct(block); - p->requantize(block2, block, qp, p->dsp.idct_permutation); - p->dsp.idct(block2); + p->requantize(block2, block, qp, p->idsp.idct_permutation); + p->idsp.idct(block2); add_block(p->temp + index, linesize, block2); } } @@ -381,6 +381,7 @@ static av_cold int init(AVFilterContext *ctx) if (!spp->avctx) return AVERROR(ENOMEM); avpriv_dsputil_init(&spp->dsp, spp->avctx); + ff_idctdsp_init(&spp->idsp, spp->avctx); spp->store_slice = store_slice_c; switch (spp->mode) { case MODE_HARD: spp->requantize = hardthresh_c; break; diff --git a/libavfilter/vf_spp.h b/libavfilter/vf_spp.h index c4293b6fc4..1884745aee 100644 --- a/libavfilter/vf_spp.h +++ b/libavfilter/vf_spp.h @@ -24,6 +24,7 @@ #include "libavcodec/avcodec.h" #include "libavcodec/dsputil.h" +#include "libavcodec/idctdsp.h" #include "avfilter.h" #define MAX_LEVEL 6 /* quality levels */ @@ -40,6 +41,7 @@ typedef struct { int16_t *temp; AVCodecContext *avctx; DSPContext dsp; + IDCTDSPContext idsp; int8_t *non_b_qp_table; int non_b_qp_alloc_size; int use_bframe_qp; |