Merge commit '43bacd5b7d3d265a77cd29d8abb131057796aecc'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 14:02:33 +0000 (16:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 14:07:37 +0000 (16:07 +0200)
* commit '43bacd5b7d3d265a77cd29d8abb131057796aecc':
  vc1: check mb_height validity.

See: b5f4836f8cb374f1a5ae45db48b61a1dfba0daad
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/vc1dec.c

@@@ -6052,6 -5966,12 +6052,9 @@@ static int vc1_decode_frame(AVCodecCont
              s->uvlinesize                    <<= 1;
          }
          mb_height = s->mb_height >> v->field_mode;
 -        if (!mb_height) {
 -            av_log(v->s.avctx, AV_LOG_ERROR, "Invalid mb_height.\n");
 -            goto err;
 -        }
++        av_assert0 (mb_height > 0);
          for (i = 0; i <= n_slices; i++) {
              if (i > 0 &&  slices[i - 1].mby_start >= mb_height) {
                  if (v->field_mode <= 0) {