diff options
| author | Michael Niedermayer | 2014-06-19 04:41:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer | 2014-06-19 04:54:38 +0200 |
| commit | 2b05db4f8102148d013755ac2a7e47f6d79ff7ca (patch) | |
| tree | 8135823ee5f9db622126672b644e06c243ae3c01 /libavcodec/asvdec.c | |
| parent | ab12373956e92b865bced9b05b12971f062cfd3e (diff) | |
| parent | e74433a8e6fc00c8dbde293c97a3e45384c2c1d9 (diff) | |
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/asvdec.c')
| -rw-r--r-- | libavcodec/asvdec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/asvdec.c b/libavcodec/asvdec.c index 038b461db1..983fd99a3f 100644 --- a/libavcodec/asvdec.c +++ b/libavcodec/asvdec.c @@ -28,6 +28,7 @@ #include "asv.h" #include "avcodec.h" +#include "blockdsp.h" #include "internal.h" #include "mathops.h" #include "mpeg12data.h" @@ -163,7 +164,7 @@ static inline int decode_mb(ASV1Context *a, int16_t block[6][64]) { int i; - a->dsp.clear_blocks(block[0]); + a->bdsp.clear_blocks(block[0]); if (a->avctx->codec_id == AV_CODEC_ID_ASV1) { for (i = 0; i < 6; i++) { @@ -276,6 +277,7 @@ static av_cold int decode_init(AVCodecContext *avctx) } ff_asv_common_init(avctx); + ff_blockdsp_init(&a->bdsp, avctx); init_vlcs(a); ff_init_scantable(a->dsp.idct_permutation, &a->scantable, ff_asv_scantab); avctx->pix_fmt = AV_PIX_FMT_YUV420P; |