diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-01-24 11:55:16 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-06-30 07:58:46 -0700 |
| commit | e3fcb14347466095839c2a3c47ebecff02da891e (patch) | |
| tree | 38fbcef2c592faae3610887dbda3ab333181d1dc /libavcodec/wmv2.c | |
| parent | adcb8392c9b185fd8a91a95fa256d15ab1432a30 (diff) | |
| download | ffmpeg-e3fcb14347466095839c2a3c47ebecff02da891e.tar.gz | |
dsputil: Split off IDCT bits into their own context
Diffstat (limited to 'libavcodec/wmv2.c')
| -rw-r--r-- | libavcodec/wmv2.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c index bd799d0e8b..b6c7bc0a9f 100644 --- a/libavcodec/wmv2.c +++ b/libavcodec/wmv2.c @@ -19,6 +19,7 @@ */ #include "avcodec.h" +#include "idctdsp.h" #include "mpegvideo.h" #include "msmpeg4data.h" #include "simple_idct.h" @@ -30,24 +31,24 @@ av_cold void ff_wmv2_common_init(Wmv2Context * w){ ff_blockdsp_init(&s->bdsp, s->avctx); ff_wmv2dsp_init(&w->wdsp); - s->dsp.idct_permutation_type = w->wdsp.idct_perm; - ff_init_scantable_permutation(s->dsp.idct_permutation, + s->idsp.idct_permutation_type = w->wdsp.idct_perm; + ff_init_scantable_permutation(s->idsp.idct_permutation, w->wdsp.idct_perm); - ff_init_scantable(s->dsp.idct_permutation, &w->abt_scantable[0], + ff_init_scantable(s->idsp.idct_permutation, &w->abt_scantable[0], ff_wmv2_scantableA); - ff_init_scantable(s->dsp.idct_permutation, &w->abt_scantable[1], + ff_init_scantable(s->idsp.idct_permutation, &w->abt_scantable[1], ff_wmv2_scantableB); - ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable, + ff_init_scantable(s->idsp.idct_permutation, &s->intra_scantable, ff_wmv1_scantable[1]); - ff_init_scantable(s->dsp.idct_permutation, &s->intra_h_scantable, + ff_init_scantable(s->idsp.idct_permutation, &s->intra_h_scantable, ff_wmv1_scantable[2]); - ff_init_scantable(s->dsp.idct_permutation, &s->intra_v_scantable, + ff_init_scantable(s->idsp.idct_permutation, &s->intra_v_scantable, ff_wmv1_scantable[3]); - ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable, + ff_init_scantable(s->idsp.idct_permutation, &s->inter_scantable, ff_wmv1_scantable[0]); - s->dsp.idct_put = w->wdsp.idct_put; - s->dsp.idct_add = w->wdsp.idct_add; - s->dsp.idct = NULL; + s->idsp.idct_put = w->wdsp.idct_put; + s->idsp.idct_add = w->wdsp.idct_add; + s->idsp.idct = NULL; } static void wmv2_add_block(Wmv2Context *w, int16_t *block1, uint8_t *dst, int stride, int n){ |