Module: libav Branch: release/9 Commit: 494f2d4f9e834db1eaf1a7d0160d497f9802013d
Author: Martin Storsjö <[email protected]> Committer: Luca Barbato <[email protected]> Date: Fri Sep 20 11:32:25 2013 +0300 vc1dec: Make sure last_picture is initialized in vc1_decode_skip_blocks Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: [email protected] Signed-off-by: Martin Storsjö <[email protected]> (cherry picked from commit 5e25fdbfe01635cfc650ac4adc27d434b2df0d64) Signed-off-by: Luca Barbato <[email protected]> Conflicts: libavcodec/vc1dec.c --- libavcodec/vc1dec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 9d68d32..dc0e197 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++) { _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
