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.h | |
| 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.h')
| -rw-r--r-- | libavfilter/vf_spp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/vf_spp.h b/libavfilter/vf_spp.h index 909d4de812..c8eac3caf2 100644 --- a/libavfilter/vf_spp.h +++ b/libavfilter/vf_spp.h @@ -23,7 +23,7 @@ #define AVFILTER_SPP_H #include "libavcodec/avcodec.h" -#include "libavcodec/dsputil.h" +#include "libavcodec/pixblockdsp.h" #include "libavcodec/idctdsp.h" #include "libavcodec/fdctdsp.h" #include "avfilter.h" @@ -41,9 +41,9 @@ typedef struct { uint8_t *src; int16_t *temp; AVCodecContext *avctx; - DSPContext dsp; IDCTDSPContext idsp; FDCTDSPContext fdsp; + PixblockDSPContext pdsp; int8_t *non_b_qp_table; int non_b_qp_alloc_size; int use_bframe_qp; |