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 /libavcodec/dvenc.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 'libavcodec/dvenc.c')
| -rw-r--r-- | libavcodec/dvenc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c index a60b834dfe..aeb4a33259 100644 --- a/libavcodec/dvenc.c +++ b/libavcodec/dvenc.c @@ -31,6 +31,7 @@ #include "dsputil.h" #include "fdctdsp.h" #include "internal.h" +#include "pixblockdsp.h" #include "put_bits.h" #include "dv.h" #include "dv_tablegen.h" @@ -41,6 +42,7 @@ static av_cold int dvvideo_encode_init(AVCodecContext *avctx) DVVideoContext *s = avctx->priv_data; DSPContext dsp; FDCTDSPContext fdsp; + PixblockDSPContext pdsp; int ret; s->sys = avpriv_dv_codec_profile(avctx); @@ -70,9 +72,10 @@ static av_cold int dvvideo_encode_init(AVCodecContext *avctx) memset(&dsp,0, sizeof(dsp)); ff_dsputil_init(&dsp, avctx); ff_fdctdsp_init(&fdsp, avctx); + ff_pixblockdsp_init(&pdsp, avctx); ff_set_cmp(&dsp, dsp.ildct_cmp, avctx->ildct_cmp); - s->get_pixels = dsp.get_pixels; + s->get_pixels = pdsp.get_pixels; s->ildct_cmp = dsp.ildct_cmp[5]; s->fdct[0] = fdsp.fdct; |