intrax8: Add a local BlockDSPContext and initialize it

Helps in decoupling this code from mpegvideo.

diff --git a/configure b/configure
index 99b94051840c0c74ec4fa1156445aac6e8ac827b..e5f50464be1b3066b7d61b8f676b15c324859f11 100755 (executable)
--- a/configure
+++ b/configure
@@ -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 b35d25214b96d66f211907b5200bf8dfae28de76..e7eda24ad4788cd8b937d9f00b417e840fbd89b1 100644 (file)
--- 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 7a0eaf7a6636d6da90eb01029d3930c39c9981f9..44954e159aa42f9d17e38d21e6d13ec60c977c80 100644 (file)
--- 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;