Module: libav Branch: release/12 Commit: 7458e548152e8ebc511137bb231ddfd4629ef319
Author: Sean McGovern <[email protected]> Committer: Sean McGovern <[email protected]> Date: Sat Jan 27 21:19:30 2018 -0500 vc1: skip motion compensation when data for last picture is invalid Bug-Id: 1101 Cc: [email protected] (cherry picked from commit 5085f25ace1e74846a0de3369bedd0e22d1a1bdc) Signed-off-by: Sean McGovern <[email protected]> --- libavcodec/vc1_mc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/vc1_mc.c b/libavcodec/vc1_mc.c index f4632d6..18ac47a 100644 --- a/libavcodec/vc1_mc.c +++ b/libavcodec/vc1_mc.c @@ -689,6 +689,11 @@ void ff_vc1_mc_4mv_chroma4(VC1Context *v, int dir, int dir2, int avg) if (s->avctx->flags & AV_CODEC_FLAG_GRAY) return; + if (!s->last_picture.f->data[1]) { + av_log(s->avctx, AV_LOG_ERROR, "Bad data in last picture frame.\n"); + return; + } + for (i = 0; i < 4; i++) { int d = i < 2 ? dir: dir2; tx = s->mv[d][i][0]; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
