forked from FFmpeg/FFmpeg
Merge commit '43bacd5b7d3d265a77cd29d8abb131057796aecc'
* commit '43bacd5b7d3d265a77cd29d8abb131057796aecc':
vc1: check mb_height validity.
See: b5f4836f8c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
91062ddef1
1 changed files with 3 additions and 0 deletions
|
@ -6052,6 +6052,9 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data,
|
||||||
s->uvlinesize <<= 1;
|
s->uvlinesize <<= 1;
|
||||||
}
|
}
|
||||||
mb_height = s->mb_height >> v->field_mode;
|
mb_height = s->mb_height >> v->field_mode;
|
||||||
|
|
||||||
|
av_assert0 (mb_height > 0);
|
||||||
|
|
||||||
for (i = 0; i <= n_slices; i++) {
|
for (i = 0; i <= n_slices; i++) {
|
||||||
if (i > 0 && slices[i - 1].mby_start >= mb_height) {
|
if (i > 0 && slices[i - 1].mby_start >= mb_height) {
|
||||||
if (v->field_mode <= 0) {
|
if (v->field_mode <= 0) {
|
||||||
|
|
Loading…
Add table
Reference in a new issue