diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-02-20 00:46:49 -0500 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-03-25 15:55:49 -0400 |
| commit | 159323897f545e7405fb9db234e0ba123e174376 (patch) | |
| tree | 2a3c2502e1f29d65cb42eca43d4d62fb16df6b88 | |
| parent | 1eaae7abb8f208fefb4e8b9e983e61b2499206a3 (diff) | |
intrax8: Add a local BlockDSPContext and initialize it
Helps in decoupling this code from mpegvideo.
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavcodec/intrax8.c | 3 | ||||
| -rw-r--r-- | libavcodec/intrax8.h | 2 |
3 files changed, 5 insertions, 2 deletions
@@ -1863,7 +1863,7 @@ error_resilience_select="me_cmp" faandct_deps="faan fdctdsp" faanidct_deps="faan idctdsp" h264dsp_select="startcode" -intrax8_select="idctdsp" +intrax8_select="blockdsp idctdsp" mdct_select="fft" rdft_select="fft" me_cmp_select="fdctdsp idctdsp pixblockdsp" diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c index b35d25214b..e7eda24ad4 100644 --- a/libavcodec/intrax8.c +++ b/libavcodec/intrax8.c @@ -587,7 +587,7 @@ static int x8_decode_intra_mb(IntraX8Context *const w, const int chroma) int sign; assert(w->orient < 12); - s->bdsp.clear_block(s->block[0]); + w->bdsp.clear_block(s->block[0]); if (chroma) dc_mode = 2; @@ -762,6 +762,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; } diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h index 7a0eaf7a66..44954e159a 100644 --- a/libavcodec/intrax8.h +++ b/libavcodec/intrax8.h @@ -19,6 +19,7 @@ #ifndef AVCODEC_INTRAX8_H #define AVCODEC_INTRAX8_H +#include "blockdsp.h" #include "get_bits.h" #include "mpegvideo.h" #include "idctdsp.h" @@ -41,6 +42,7 @@ typedef struct IntraX8Context { MpegEncContext *s; IntraX8DSPContext dsp; IDCTDSPContext idsp; + BlockDSPContext bdsp; int quant; int dquant; int qsum; |