diff options
| author | Martin Storsjö <[email protected]> | 2013-09-20 11:32:25 +0300 |
|---|---|---|
| committer | Luca Barbato <[email protected]> | 2014-01-07 09:43:58 +0100 |
| commit | 9925f7df0a50387ade8d83cb85b40c53e41e7041 (patch) | |
| tree | bb0c1bf267233cd8ea5ba1a91e92ce244ad397ee | |
| parent | 29fa517d40ed485a24128d005ee796f0355398e1 (diff) | |
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
(cherry picked from commit 494f2d4f9e834db1eaf1a7d0160d497f9802013d)
| -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 8c28aa9bc2..cf960f6816 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++) { |