diff options
| -rw-r--r-- | src/libffmpeg/libavcodec/mlib/dsputil_mlib.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/libffmpeg/libavcodec/mlib/dsputil_mlib.c b/src/libffmpeg/libavcodec/mlib/dsputil_mlib.c index 7a0f9d564..3b003325a 100644 --- a/src/libffmpeg/libavcodec/mlib/dsputil_mlib.c +++ b/src/libffmpeg/libavcodec/mlib/dsputil_mlib.c @@ -226,7 +226,7 @@ static void ff_fdct_mlib(DCTELEM *data) mlib_VideoDCT8x8_S16_S16 (data, data); } -void dsputil_init_mlib(DSPContext* c, unsigned mask) +void dsputil_init_mlib(DSPContext* c, AVCodecContext *avctx) { c->put_pixels_tab[0][0] = put_pixels16_mlib; c->put_pixels_tab[0][1] = put_pixels16_x2_mlib; @@ -251,19 +251,18 @@ void dsputil_init_mlib(DSPContext* c, unsigned mask) c->add_pixels_clamped = add_pixels_clamped_mlib; put_pixels_clamped = c->put_pixels_clamped; -} - -void MPV_common_init_mlib(MpegEncContext *s) -{ - int i; - if(s->avctx->dct_algo==FF_DCT_AUTO || s->avctx->dct_algo==FF_DCT_MLIB){ - s->fdct = ff_fdct_mlib; + if(avctx->dct_algo==FF_DCT_AUTO || avctx->dct_algo==FF_DCT_MLIB){ + c->fdct = ff_fdct_mlib; } - if(s->avctx->idct_algo==FF_IDCT_AUTO || s->avctx->idct_algo==FF_IDCT_MLIB){ - s->idct_put= ff_idct_put_mlib; - s->idct_add= ff_idct_add_mlib; - s->idct_permutation_type= FF_NO_IDCT_PERM; + if(avctx->idct_algo==FF_IDCT_AUTO || avctx->idct_algo==FF_IDCT_MLIB){ + c->idct_put= ff_idct_put_mlib; + c->idct_add= ff_idct_add_mlib; + c->idct_permutation_type= FF_NO_IDCT_PERM; } } + +void MPV_common_init_mlib(MpegEncContext *s) +{ +} |