diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-24 12:36:23 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-24 12:36:23 +0100 |
| commit | 896fce85096622b29c0312f4aa450f879d44f3cc (patch) | |
| tree | 81e26edddcdac1c3cf32f17fb0e802ecbc264dcb /libavcodec/intrax8.c | |
| parent | 52692eed615cc6dd05edae5505044401059408a0 (diff) | |
| parent | 159323897f545e7405fb9db234e0ba123e174376 (diff) | |
| download | ffmpeg-896fce85096622b29c0312f4aa450f879d44f3cc.tar.gz | |
Merge commit '159323897f545e7405fb9db234e0ba123e174376'
* commit '159323897f545e7405fb9db234e0ba123e174376':
intrax8: Add a local BlockDSPContext and initialize it
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/intrax8.c')
| -rw-r--r-- | libavcodec/intrax8.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c index a4aaad6ef0..f6131eefa7 100644 --- a/libavcodec/intrax8.c +++ b/libavcodec/intrax8.c @@ -583,7 +583,7 @@ static int x8_decode_intra_mb(IntraX8Context *const w, const int chroma) int sign; av_assert2(w->orient < 12); - s->bdsp.clear_block(s->block[0]); + w->bdsp.clear_block(s->block[0]); if (chroma) dc_mode = 2; @@ -763,6 +763,7 @@ av_cold int ff_intrax8_common_init(AVCodecContext *avctx, ff_wmv1_scantable[3]); ff_intrax8dsp_init(&w->dsp); + ff_blockdsp_init(&w->bdsp, avctx); return 0; } |