Merge commit 'accde1bd8756936e1757b42fc9bad2eb5d192f8a'

[ffmpeg] / libavcodec / intrax8.h

diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h
index 40d689a93c67950dca47f52b4985b3b73427eb0c..998178540373651c2a2351ffd29e2e24ccb766b4 100644 (file)
--- a/libavcodec/intrax8.h
+++ b/libavcodec/intrax8.h
@@ -22,6 +22,7 @@
 #include "get_bits.h"
 #include "mpegvideo.h"
 #include "intrax8dsp.h"
+#include "wmv2dsp.h"
 
 typedef struct IntraX8Context {
     VLC * j_ac_vlc[4];//they point to the static j_mb_vlc
@@ -32,6 +33,8 @@ typedef struct IntraX8Context {
 //set by ff_intrax8_common_init
     uint8_t * prediction_table;//2*(mb_w*2)
     ScanTable scantable[3];
+    WMV2DSPContext wdsp;
+    uint8_t idct_permutation[64];
 //set by the caller codec
     MpegEncContext * s;
     IntraX8DSPContext dsp;