diff options
author | Diego Biurrun <diego@biurrun.de> | 2014-01-14 10:33:47 +0100 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2014-06-18 14:07:23 -0700 |
commit | e74433a8e6fc00c8dbde293c97a3e45384c2c1d9 (patch) | |
tree | f975b37a58a7c6e62c84c12349610ce6f40ad4d1 /libavcodec/mpegvideo.c | |
parent | 869fc416f7c78ed4e397e0208acd1545771c0502 (diff) | |
download | ffmpeg-e74433a8e6fc00c8dbde293c97a3e45384c2c1d9.tar.gz |
dsputil: Split clear_block*/fill_block* off into a separate context
Diffstat (limited to 'libavcodec/mpegvideo.c')
-rw-r--r-- | libavcodec/mpegvideo.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index aea6321518..f6fc8dc3a8 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -33,6 +33,7 @@ #include "libavutil/internal.h" #include "libavutil/timer.h" #include "avcodec.h" +#include "blockdsp.h" #include "dsputil.h" #include "internal.h" #include "mathops.h" @@ -363,7 +364,7 @@ static void mpeg_er_decode_mb(void *opaque, int ref, int mv_dir, int mv_type, ff_init_block_index(s); ff_update_block_index(s); - s->dsp.clear_blocks(s->block[0]); + s->bdsp.clear_blocks(s->block[0]); s->dest[0] = s->current_picture.f->data[0] + (s->mb_y * 16 * s->linesize) + s->mb_x * 16; s->dest[1] = s->current_picture.f->data[1] + (s->mb_y * (16 >> s->chroma_y_shift) * s->uvlinesize) + s->mb_x * (16 >> s->chroma_x_shift); @@ -376,6 +377,7 @@ static void mpeg_er_decode_mb(void *opaque, int ref, int mv_dir, int mv_type, /* init common dct for both encoder and decoder */ 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_videodsp_init(&s->vdsp, s->avctx->bits_per_raw_sample); |