[libav-stable] vc1dec: Make sure last_picture is initialized in vc1_decode_skip_blocks

Martin Storsjö git at libav.org
Sun Sep 22 20:31:31 CEST 2013


Module: libav
Branch: master
Commit: 5e25fdbfe01635cfc650ac4adc27d434b2df0d64

Author:    Martin Storsjö <martin at martin.st>
Committer: Martin Storsjö <martin at martin.st>
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: libav-stable at libav.org
Signed-off-by: Martin Storsjö <martin at martin.st>

---

 libavcodec/vc1dec.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index d0566a3..4fcc818 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -5143,6 +5143,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->er, 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++) {



More information about the libav-stable mailing list