Merge commit '159323897f545e7405fb9db234e0ba123e174376'

* commit '159323897f545e7405fb9db234e0ba123e174376':
  intrax8: Add a local BlockDSPContext and initialize it

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

3 files changed, 5 insertions, 2 deletions

diff --git a/configure b/configure
index 1f5788b855..ef0b689a00 100755
--- a/configure
+++ b/configure
@@ -2261,7 +2261,7 @@ faandct_deps="faan fdctdsp"
 faanidct_deps="faan idctdsp"
 h264dsp_select="startcode"
 frame_thread_encoder_deps="encoders threads"
-intrax8_select="idctdsp"
+intrax8_select="blockdsp idctdsp"
 mdct_select="fft"
 me_cmp_select="fdctdsp idctdsp pixblockdsp"
 mpeg_er_select="error_resilience"
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;
 }
diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h
index af19582190..ed3dcc661f 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"
@@ -44,6 +45,7 @@ typedef struct IntraX8Context {
     MpegEncContext * s;
     IntraX8DSPContext dsp;
     IDCTDSPContext idsp;
+    BlockDSPContext bdsp;
     int quant;
     int dquant;
     int qsum;