Merge commit '9fa888c02801fff2e8817c24068f5296bbe60000'

* commit '9fa888c02801fff2e8817c24068f5296bbe60000':
  intrax8: Keep a reference to the decoder blocks

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

1 files changed, 6 insertions, 0 deletions

diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h
index c8897fe863..a28c7cafec 100644
--- a/libavcodec/intrax8.h
+++ b/libavcodec/intrax8.h
@@ -40,6 +40,8 @@ typedef struct IntraX8Context {
     WMV2DSPContext wdsp;
     uint8_t idct_permutation[64];
     AVCodecContext *avctx;
+    int *block_last_index;  ///< last nonzero coefficient in block
+    int16_t (*block)[64];
 
     //set by the caller codec
     MpegEncContext * s;
@@ -80,6 +82,8 @@ typedef struct IntraX8Context {
  * @param avctx pointer to AVCodecContext
  * @param w pointer to IntraX8Context
  * @param idsp pointer to IDCTDSPContext
+ * @param block pointer to block array
+ * @param block_last_index pointer to index array
  * @param mb_width macroblock width
  * @param mb_height macroblock height
  * @param s pointer to MpegEncContext of the parent codec
@@ -87,6 +91,8 @@ typedef struct IntraX8Context {
  */
 int ff_intrax8_common_init(AVCodecContext *avctx,
                            IntraX8Context *w, IDCTDSPContext *idsp,
+                           int16_t (*block)[64],
+                           int block_last_index[12],
                            int mb_width, int mb_height,
                            MpegEncContext *const s);