diff options
| author | Martin Storsjö <martin@martin.st> | 2013-09-20 11:32:25 +0300 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-10-04 04:45:35 +0200 |
| commit | 494f2d4f9e834db1eaf1a7d0160d497f9802013d (patch) | |
| tree | 3a9da55c41a059b33a7e5904d3c611ae344ef7b0 | |
| parent | 99fe4c577fc88dc7421b6aa6837e65401b5e56db (diff) | |
| download | ffmpeg-494f2d4f9e834db1eaf1a7d0160d497f9802013d.tar.gz | |
vc1dec: Make sure last_picture is initialized in vc1_decode_skip_blocks
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit 5e25fdbfe01635cfc650ac4adc27d434b2df0d64)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Conflicts:
libavcodec/vc1dec.c
| -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 9d68d32c13..dc0e197520 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -4742,6 +4742,9 @@ static void vc1_decode_skip_blocks(VC1Context *v) { MpegEncContext *s = &v->s; + if (!v->s.last_picture.f.data[0]) + return; + ff_er_add_slice(s, 0, s->start_mb_y, s->mb_width - 1, s->end_mb_y - 1, ER_MB_END); s->first_slice_line = 1; for (s->mb_y = s->start_mb_y; s->mb_y < s->end_mb_y; s->mb_y++) { |