Merge commit '1eaae7abb8f208fefb4e8b9e983e61b2499206a3'

* commit '1eaae7abb8f208fefb4e8b9e983e61b2499206a3':
  intrax8: Reference the current AVCodecContext

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

1 files changed, 4 insertions, 1 deletions

diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h
index 988f0c10ec..af19582190 100644
--- a/libavcodec/intrax8.h
+++ b/libavcodec/intrax8.h
@@ -38,6 +38,7 @@ typedef struct IntraX8Context {
     ScanTable scantable[3];
     WMV2DSPContext wdsp;
     uint8_t idct_permutation[64];
+    AVCodecContext *avctx;
 
     //set by the caller codec
     MpegEncContext * s;
@@ -70,12 +71,14 @@ typedef struct IntraX8Context {
 /**
  * Initialize IntraX8 frame decoder.
  * Requires valid MpegEncContext with valid s->mb_width before calling.
+ * @param avctx pointer to AVCodecContext
  * @param w pointer to IntraX8Context
  * @param idsp pointer to IDCTDSPContext
  * @param s pointer to MpegEncContext of the parent codec
  * @return 0 on success, a negative AVERROR value on error
  */
-int ff_intrax8_common_init(IntraX8Context *w, IDCTDSPContext *idsp,
+int ff_intrax8_common_init(AVCodecContext *avctx,
+                           IntraX8Context *w, IDCTDSPContext *idsp,
                            MpegEncContext *const s);
 
 /**