Merge commit 'd0540fd02171a6233d2016b199d013299debf7e3'

* commit 'd0540fd02171a6233d2016b199d013299debf7e3':
  intrax8: Pass macroblock size to ff_intrax8_common_init

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

diff --cc libavcodec/intrax8.c
Simple merge

diff --cc libavcodec/intrax8.h
Simple merge

diff --cc libavcodec/vc1dec.c
index 786c6db,d1a99d7..89996a1
--- 1/libavcodec/vc1dec.c
--- 2/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@@ -382,12 -372,16 +382,14 @@@ av_cold int ff_vc1_decode_init_alloc_ta
      v->mv_f_next[1]     = v->mv_f_next[0] + (s->b8_stride * (mb_height * 2 + 1) + s->mb_stride * (mb_height + 1) * 2);
  
      if (s->avctx->codec_id == AV_CODEC_ID_WMV3IMAGE || s->avctx->codec_id == AV_CODEC_ID_VC1IMAGE) {
 -        for (i = 0; i < 4; i++) {
 -            v->sr_rows[i >> 1][i & 1] = av_malloc(v->output_width);
 -            if (!v->sr_rows[i >> 1][i & 1])
 -                goto error;
 -        }
 +        for (i = 0; i < 4; i++)
 +            if (!(v->sr_rows[i >> 1][i & 1] = av_malloc(v->output_width)))
 +                return AVERROR(ENOMEM);
      }
  
-     ret = ff_intrax8_common_init(s->avctx, &v->x8, &s->idsp, s);
+     ret = ff_intrax8_common_init(s->avctx, &v->x8, &s->idsp,
+                                  s->mb_width, s->mb_height,
+                                  s);
      if (ret < 0)
          goto error;
  

diff --cc libavcodec/wmv2dec.c
Simple merge