diff options
Diffstat (limited to 'libavcodec/dvenc.c')
-rw-r--r-- | libavcodec/dvenc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c index aeb4a33259..4ea181c6d8 100644 --- a/libavcodec/dvenc.c +++ b/libavcodec/dvenc.c @@ -28,9 +28,9 @@ #include "libavutil/pixdesc.h" #include "config.h" #include "avcodec.h" -#include "dsputil.h" #include "fdctdsp.h" #include "internal.h" +#include "me_cmp.h" #include "pixblockdsp.h" #include "put_bits.h" #include "dv.h" @@ -40,8 +40,8 @@ static av_cold int dvvideo_encode_init(AVCodecContext *avctx) { DVVideoContext *s = avctx->priv_data; - DSPContext dsp; FDCTDSPContext fdsp; + MECmpContext mecc; PixblockDSPContext pdsp; int ret; @@ -69,14 +69,14 @@ static av_cold int dvvideo_encode_init(AVCodecContext *avctx) dv_vlc_map_tableinit(); - memset(&dsp,0, sizeof(dsp)); - ff_dsputil_init(&dsp, avctx); + memset(&mecc,0, sizeof(mecc)); ff_fdctdsp_init(&fdsp, avctx); + ff_me_cmp_init(&mecc, avctx); ff_pixblockdsp_init(&pdsp, avctx); - ff_set_cmp(&dsp, dsp.ildct_cmp, avctx->ildct_cmp); + ff_set_cmp(&mecc, mecc.ildct_cmp, avctx->ildct_cmp); s->get_pixels = pdsp.get_pixels; - s->ildct_cmp = dsp.ildct_cmp[5]; + s->ildct_cmp = mecc.ildct_cmp[5]; s->fdct[0] = fdsp.fdct; s->fdct[1] = fdsp.fdct248; |