aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Aimar <fenrir@videolan.org>2011-09-21 20:46:30 +0200
committerReinhard Tartler <siretart@tauware.de>2012-03-18 17:50:30 +0100
commitefe3fb13a79957ea94f2766c3f3e502ae775eace (patch)
tree2aa0d8755b4d4748798b493ec40fb9b1de27e50d
parent987f5dc55ed5b1d882ad8d8adb3e51b4e3aa4679 (diff)
downloadffmpeg-efe3fb13a79957ea94f2766c3f3e502ae775eace.tar.gz
vp56: Check for missing reference frame data
Signed-off-by: Janne Grunau <janne-libav@jannau.net> (cherry picked from commit 0ec6d6e9b682318b5b5b5457e09fbf3c4ca41335) Signed-off-by: Anton Khirnov <anton@khirnov.net>
-rw-r--r--libavcodec/vp56.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c
index a6b201478e..4fd1341bdb 100644
--- a/libavcodec/vp56.c
+++ b/libavcodec/vp56.c
@@ -399,6 +399,8 @@ static void vp56_decode_mb(VP56Context *s, int row, int col, int is_alpha)
frame_current = s->framep[VP56_FRAME_CURRENT];
frame_ref = s->framep[ref_frame];
+ if (mb_type != VP56_MB_INTRA && !frame_ref->data[0])
+ return;
ab = 6*is_alpha;
b_max = 6 - 2*is_alpha;