Merge commit 'e66fa35392cd45d0a80774cd057fb765d60def43'

* commit 'e66fa35392cd45d0a80774cd057fb765d60def43':
  vc1dec: Check group allocations separatedly

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

diff --cc libavcodec/vc1dec.c
index 4d839673ebe81da1b36a70b466052aa04a630f86,ce5549366e9e262d2614904919b47dec660d5455..75d069dd39989fcbd4399e64e43c181539da27ca
--- 1/libavcodec/vc1dec.c
--- 2/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@@ -338,12 -331,20 +341,20 @@@ av_cold int ff_vc1_decode_init_alloc_ta
      v->n_allocated_blks = s->mb_width + 2;
      v->block            = av_malloc(sizeof(*v->block) * v->n_allocated_blks);
      v->cbp_base         = av_malloc(sizeof(v->cbp_base[0]) * 2 * s->mb_stride);
+     if (!v->block || !v->cbp_base)
+         goto error;
      v->cbp              = v->cbp_base + s->mb_stride;
      v->ttblk_base       = av_malloc(sizeof(v->ttblk_base[0]) * 2 * s->mb_stride);
+     if (!v->ttblk_base)
+         goto error;
      v->ttblk            = v->ttblk_base + s->mb_stride;
      v->is_intra_base    = av_mallocz(sizeof(v->is_intra_base[0]) * 2 * s->mb_stride);
+     if (!v->is_intra_base)
+         goto error;
      v->is_intra         = v->is_intra_base + s->mb_stride;
 -    v->luma_mv_base     = av_malloc(sizeof(v->luma_mv_base[0]) * 2 * s->mb_stride);
 +    v->luma_mv_base     = av_mallocz(sizeof(v->luma_mv_base[0]) * 2 * s->mb_stride);
+     if (!v->luma_mv_base)
+         goto error;
      v->luma_mv          = v->luma_mv_base + s->mb_stride;
  
      /* allocate block type info in that way so it could be used with s->block_index[] */
@@@ -365,17 -374,13 +384,11 @@@
      ff_intrax8_common_init(&v->x8,s);
  
      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);
      }
  
-     if (!v->mv_type_mb_plane || !v->direct_mb_plane || !v->acpred_plane || !v->over_flags_plane ||
-         !v->block || !v->cbp_base || !v->ttblk_base || !v->is_intra_base || !v->luma_mv_base ||
-         !v->mb_type_base) {
-         goto error;
-     }
- 
      return 0;
  
  error: