diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-10 00:56:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-10 01:22:14 +0200 |
| commit | 2d5e9451de3c7ab00cac6ec4aff290e12a2f190d (patch) | |
| tree | 9934a09e3ad1f63796274ee59f216df19cd9ca02 /libavfilter/vf_spp.c | |
| parent | 6cc1fec41263add956b35af96d7c4a81c9436a65 (diff) | |
| parent | f46bb608d9d76c543e4929dc8cffe36b84bd789e (diff) | |
| download | ffmpeg-2d5e9451de3c7ab00cac6ec4aff290e12a2f190d.tar.gz | |
Merge commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e'
* commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e':
dsputil: Split off pixel block routines into their own context
Conflicts:
configure
libavcodec/dsputil.c
libavcodec/mpegvideo_enc.c
libavcodec/pixblockdsp_template.c
libavcodec/x86/dsputilenc.asm
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/vf_spp.c b/libavfilter/vf_spp.c index 9df87ff3f2..4e4a5795f4 100644 --- a/libavfilter/vf_spp.c +++ b/libavfilter/vf_spp.c @@ -232,7 +232,7 @@ static void filter(SPPContext *p, uint8_t *dst, uint8_t *src, const int x1 = x + offset[i + count - 1][0]; 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->pdsp.get_pixels(block, p->src + index, linesize); p->fdsp.fdct(block); p->requantize(block2, block, qp, p->idsp.idct_permutation); p->idsp.idct(block2); @@ -380,9 +380,9 @@ static av_cold int init(AVFilterContext *ctx) spp->avctx = avcodec_alloc_context3(NULL); if (!spp->avctx) return AVERROR(ENOMEM); - avpriv_dsputil_init(&spp->dsp, spp->avctx); ff_idctdsp_init(&spp->idsp, spp->avctx); ff_fdctdsp_init(&spp->fdsp, spp->avctx); + ff_pixblockdsp_init(&spp->pdsp, spp->avctx); spp->store_slice = store_slice_c; switch (spp->mode) { case MODE_HARD: spp->requantize = hardthresh_c; break; |