[FFmpeg-cvslog] vc1: skip motion compensation when data for last picture is invalid

Sean McGovern git at videolan.org
Mon Feb 12 03:48:02 EET 2018


ffmpeg | branch: master | Sean McGovern <gseanmcg at gmail.com> | Sat Jan 27 21:19:30 2018 -0500| [5085f25ace1e74846a0de3369bedd0e22d1a1bdc] | committer: Sean McGovern

vc1: skip motion compensation when data for last picture is invalid

Bug-Id: 1101
Cc: libav-stable at libav.org

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5085f25ace1e74846a0de3369bedd0e22d1a1bdc
---

 libavcodec/vc1_mc.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/vc1_mc.c b/libavcodec/vc1_mc.c
index f4632d6247..18ac47a037 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];



More information about the ffmpeg-cvslog mailing list