From 159323897f545e7405fb9db234e0ba123e174376 Mon Sep 17 00:00:00 2001
From: Vittorio Giovara <vittorio.giovara@gmail.com>
Date: Sat, 20 Feb 2016 00:46:49 -0500
Subject: intrax8: Add a local BlockDSPContext and initialize it

Helps in decoupling this code from mpegvideo.
---
 libavcodec/intrax8.c | 3 ++-
 libavcodec/intrax8.h | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'libavcodec')

diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c
index b35d252..e7eda24 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 7a0eaf7..44954e1 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;
-- 
cgit v1.1