[FFmpeg-cvslog] vc1dec: Make sure last_picture is initialized in vc1_decode_skip_blocks
Martin Storsjö
git at videolan.org
Thu Jan 16 22:49:49 CET 2014
ffmpeg | branch: release/0.10 | Martin Storsjö <martin at martin.st> | Fri Sep 20 11:32:25 2013 +0300| [9925f7df0a50387ade8d83cb85b40c53e41e7041] | committer: Luca Barbato
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>
(cherry picked from commit 5e25fdbfe01635cfc650ac4adc27d434b2df0d64)
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
Conflicts:
libavcodec/vc1dec.c
(cherry picked from commit 494f2d4f9e834db1eaf1a7d0160d497f9802013d)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9925f7df0a50387ade8d83cb85b40c53e41e7041
---
libavcodec/vc1dec.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 8c28aa9..cf960f6 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -4741,6 +4741,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++) {
More information about the ffmpeg-cvslog
mailing list