diff options
author | Diego Biurrun <diego@biurrun.de> | 2014-02-08 02:59:58 +0100 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2014-07-17 09:07:10 -0700 |
commit | 2d60444331fca1910510038dd3817bea885c2367 (patch) | |
tree | 51ac937c7e051b03c7cc8e39b079a37f18dd09b0 /libavcodec/mpegvideo.c | |
parent | a578b0407dc983aecd72028e1127062689b67089 (diff) | |
download | ffmpeg-2d60444331fca1910510038dd3817bea885c2367.tar.gz |
dsputil: Split motion estimation compare bits off into their own context
Diffstat (limited to 'libavcodec/mpegvideo.c')
-rw-r--r-- | libavcodec/mpegvideo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index a4a37d4931..e1daa2aee0 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -378,9 +378,9 @@ static void mpeg_er_decode_mb(void *opaque, int ref, int mv_dir, int mv_type, av_cold int ff_dct_common_init(MpegEncContext *s) { ff_blockdsp_init(&s->bdsp, s->avctx); - ff_dsputil_init(&s->dsp, s->avctx); ff_hpeldsp_init(&s->hdsp, s->avctx->flags); ff_idctdsp_init(&s->idsp, s->avctx); + ff_me_cmp_init(&s->mecc, s->avctx); ff_mpegvideodsp_init(&s->mdsp); ff_videodsp_init(&s->vdsp, s->avctx->bits_per_raw_sample); @@ -1051,7 +1051,7 @@ static int init_er(MpegEncContext *s) int i; er->avctx = s->avctx; - er->dsp = &s->dsp; + er->mecc = &s->mecc; er->mb_index2xy = s->mb_index2xy; er->mb_num = s->mb_num; |