diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-19 04:41:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-19 04:54:38 +0200 |
| commit | 2b05db4f8102148d013755ac2a7e47f6d79ff7ca (patch) | |
| tree | 8135823ee5f9db622126672b644e06c243ae3c01 /libavcodec/wmv2.c | |
| parent | ab12373956e92b865bced9b05b12971f062cfd3e (diff) | |
| parent | e74433a8e6fc00c8dbde293c97a3e45384c2c1d9 (diff) | |
| download | ffmpeg-2b05db4f8102148d013755ac2a7e47f6d79ff7ca.tar.gz | |
Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'
* commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9':
dsputil: Split clear_block*/fill_block* off into a separate context
Conflicts:
configure
libavcodec/asvdec.c
libavcodec/dnxhddec.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.h
libavcodec/eamad.c
libavcodec/intrax8.c
libavcodec/mjpegdec.c
libavcodec/ppc/dsputil_ppc.c
libavcodec/vc1dec.c
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmv2.c')
| -rw-r--r-- | libavcodec/wmv2.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c index 7ac72a5e70..3d08396cc0 100644 --- a/libavcodec/wmv2.c +++ b/libavcodec/wmv2.c @@ -28,6 +28,7 @@ av_cold void ff_wmv2_common_init(Wmv2Context * w){ MpegEncContext * const s= &w->s; + 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, @@ -60,12 +61,12 @@ static void wmv2_add_block(Wmv2Context *w, int16_t *block1, uint8_t *dst, int st case 1: ff_simple_idct84_add(dst , stride, block1); ff_simple_idct84_add(dst + 4*stride, stride, w->abt_block2[n]); - s->dsp.clear_block(w->abt_block2[n]); + s->bdsp.clear_block(w->abt_block2[n]); break; case 2: ff_simple_idct48_add(dst , stride, block1); ff_simple_idct48_add(dst + 4 , stride, w->abt_block2[n]); - s->dsp.clear_block(w->abt_block2[n]); + s->bdsp.clear_block(w->abt_block2[n]); break; default: av_log(s->avctx, AV_LOG_ERROR, "internal error in WMV2 abt\n"); |