diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 16:02:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 16:07:37 +0200 |
| commit | 91062ddef18e94d54e4b37b288c77c11947d8756 (patch) | |
| tree | fe6cd81b188e5b040ef4e6a98bd943675ca16164 /libavcodec | |
| parent | f606c6e92c63e914d3e44052fde9005d5bec1249 (diff) | |
| parent | 43bacd5b7d3d265a77cd29d8abb131057796aecc (diff) | |
| download | ffmpeg-91062ddef18e94d54e4b37b288c77c11947d8756.tar.gz | |
Merge commit '43bacd5b7d3d265a77cd29d8abb131057796aecc'
* commit '43bacd5b7d3d265a77cd29d8abb131057796aecc':
vc1: check mb_height validity.
See: b5f4836f8cb374f1a5ae45db48b61a1dfba0daad
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vc1dec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 3aeb90f852..49facd273e 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -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) { |