It will be needed in later commits. --- libavcodec/intrax8.c | 4 +++- libavcodec/intrax8.h | 5 ++++- libavcodec/vc1dec.c | 2 +- libavcodec/wmv2dec.c | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c index 336551f..3365995 100644 --- a/libavcodec/intrax8.c +++ b/libavcodec/intrax8.c @@ -736,13 +736,15 @@ static void x8_init_block_index(IntraX8Context *w, AVFrame *frame, int mb_y) w->dest[2] += (mb_y & (~1)) * uvlinesize << 2; } -av_cold int ff_intrax8_common_init(IntraX8Context *w, IDCTDSPContext *idsp, +av_cold int ff_intrax8_common_init(AVCodecContext *avctx, + IntraX8Context *w, IDCTDSPContext *idsp, MpegEncContext *const s) { int ret = x8_vlc_init(); if (ret < 0) return ret; + w->avctx = avctx; w->idsp = *idsp; w->s = s; diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h index 1a043d4..5b72532 100644 --- a/libavcodec/intrax8.h +++ b/libavcodec/intrax8.h @@ -35,6 +35,7 @@ typedef struct IntraX8Context { // set by ff_intrax8_common_init uint8_t *prediction_table; // 2 * (mb_w * 2) ScanTable scantable[3]; + AVCodecContext *avctx; // set by the caller codec MpegEncContext *s; @@ -67,12 +68,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); /** diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 948626c..cbdd560 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -371,7 +371,7 @@ av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v) v->mv_f_next[0] = v->mv_f_next_base + s->b8_stride + 1; v->mv_f_next[1] = v->mv_f_next[0] + (s->b8_stride * (mb_height * 2 + 1) + s->mb_stride * (mb_height + 1) * 2); - ret = ff_intrax8_common_init(&v->x8, &s->idsp, s); + ret = ff_intrax8_common_init(s->avctx, &v->x8, &s->idsp, s); if (ret < 0) goto error; diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index d7828ad..0560d95 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -473,7 +473,7 @@ static av_cold int wmv2_decode_init(AVCodecContext *avctx) ff_wmv2_common_init(w); - return ff_intrax8_common_init(&w->x8, &w->s.idsp, &w->s); + return ff_intrax8_common_init(avctx, &w->x8, &w->s.idsp, &w->s); } static av_cold int wmv2_decode_end(AVCodecContext *avctx) -- 2.7.3 _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel