[FFmpeg-cvslog] avfilter/vf_spp: Use dct->get_pixels()
Michael Niedermayer
git at videolan.org
Sun Aug 3 23:45:20 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Aug 3 23:36:01 2014 +0200| [a7e87fef214c4a63872c03aef93241422fa95dff] | committer: Michael Niedermayer
avfilter/vf_spp: Use dct->get_pixels()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a7e87fef214c4a63872c03aef93241422fa95dff
---
libavfilter/vf_spp.c | 3 +--
libavfilter/vf_spp.h | 2 --
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/libavfilter/vf_spp.c b/libavfilter/vf_spp.c
index bcaf2c9..989e283 100644
--- a/libavfilter/vf_spp.c
+++ b/libavfilter/vf_spp.c
@@ -250,7 +250,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->pdsp.get_pixels(block, p->src + index, linesize);
+ p->dct->get_pixels(block, p->src + index, linesize);
p->dct->fdct(block);
p->requantize(block2, block, qp, p->dct->idct_permutation);
p->dct->idct(block2);
@@ -400,7 +400,6 @@ static av_cold int init_dict(AVFilterContext *ctx, AVDictionary **opts)
spp->dct = avcodec_dct_alloc();
if (!spp->avctx || !spp->dct)
return AVERROR(ENOMEM);
- ff_pixblockdsp_init(&spp->pdsp, spp->avctx);
if (opts) {
AVDictionaryEntry *e = NULL;
diff --git a/libavfilter/vf_spp.h b/libavfilter/vf_spp.h
index 2dcf813..7e7e227 100644
--- a/libavfilter/vf_spp.h
+++ b/libavfilter/vf_spp.h
@@ -23,7 +23,6 @@
#define AVFILTER_SPP_H
#include "libavcodec/avcodec.h"
-#include "libavcodec/pixblockdsp.h"
#include "libavcodec/avdct.h"
#include "avfilter.h"
@@ -40,7 +39,6 @@ typedef struct {
uint8_t *src;
int16_t *temp;
AVCodecContext *avctx;
- PixblockDSPContext pdsp;
AVDCT *dct;
int8_t *non_b_qp_table;
int non_b_qp_alloc_size;
More information about the ffmpeg-cvslog
mailing list