---
configure | 2 +-
libavcodec/intrax8.c | 3 ++-
libavcodec/intrax8.h | 2 ++
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index d11b128..51141db 100755
--- a/configure
+++ b/configure
@@ -1860,7 +1860,7 @@ error_resilience_select="me_cmp"
faandct_deps="faan fdctdsp"
faanidct_deps="faan idctdsp"
h264dsp_select="startcode"
-intrax8_select="error_resilience idctdsp"
+intrax8_select="blockdsp error_resilience idctdsp"
mdct_select="fft"
rdft_select="fft"
me_cmp_select="fdctdsp idctdsp pixblockdsp"
diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c
index b03da68..18803b4 100644
--- a/libavcodec/intrax8.c
+++ b/libavcodec/intrax8.c
@@ -579,7 +579,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;
@@ -755,6 +755,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 5d73d79..4b69b34 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;
--
2.7.0
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
