Merge commit '8072345e9f86d88fbc4a15c17cb03f1e4701c9a5'

* commit '8072345e9f86d88fbc4a15c17cb03f1e4701c9a5':
  intrax8: Keep a reference to the GetBitContext reader

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

1 files changed, 3 insertions, 1 deletions

diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h
index 64a33cea2f..988f0c10ec 100644
--- a/libavcodec/intrax8.h
+++ b/libavcodec/intrax8.h
@@ -48,6 +48,7 @@ typedef struct IntraX8Context {
     int qsum;
     int loopfilter;
     AVFrame *frame;
+    GetBitContext *gb;
 
     // calculated per frame
     int quant_dc_chroma;
@@ -85,18 +86,19 @@ void ff_intrax8_common_end(IntraX8Context *w);
 
 /**
  * Decode single IntraX8 frame.
- * The parent codec must fill s->gb (bitstream).
  * The parent codec must call ff_mpv_frame_start() before calling this function.
  * The parent codec must call ff_mpv_frame_end() after calling this function.
  * This function does not use ff_mpv_decode_mb().
  * lowres decoding is theoretically impossible.
  * @param w pointer to IntraX8Context
  * @param pict the output Picture containing an AVFrame
+ * @param gb open bitstream reader
  * @param dquant doubled quantizer, it would be odd in case of VC-1 halfpq==1.
  * @param quant_offset offset away from zero
  * @param loopfilter enable filter after decoding a block
  */
 int ff_intrax8_decode_picture(IntraX8Context *w, Picture *pict,
+                              GetBitContext *gb,
                               int quant, int halfpq, int loopfilter);
 
 #endif /* AVCODEC_INTRAX8_H */