Commit 91062dde authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '43bacd5b'

* commit '43bacd5b':
  vc1: check mb_height validity.

See: b5f4836fMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents f606c6e9 43bacd5b
......@@ -6052,6 +6052,9 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data,
s->uvlinesize <<= 1;
}
mb_height = s->mb_height >> v->field_mode;
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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment