[FFmpeg-devel] [PATCH] vp9: disable use_last_frame_mvs on resolution change (scalable).

[Ronald S. Bultje]

Prevents some invalid memory accesses after resolution change in
vp90-2-05-resize.webm, and libvpx does this too.
---
 libavcodec/vp9.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
index d7c9752..02f76e6 100644
--- a/libavcodec/vp9.c
+++ b/libavcodec/vp9.c
@@ -479,7 +479,6 @@ static int decode_frame_header(AVCodecContext *ctx,
     last_invisible    = s->invisible;
     s->invisible      = !get_bits1(&s->gb);
     s->errorres       = get_bits1(&s->gb);
-    // FIXME disable this upon resolution change
     s->use_last_frame_mvs = !s->errorres && !last_invisible;
     if (s->keyframe) {
         if (get_bits_long(&s->gb, 24) != VP9_SYNCCODE) { // synccode
@@ -538,6 +537,8 @@ static int decode_frame_header(AVCodecContext *ctx,
                 w = get_bits(&s->gb, 16) + 1;
                 h = get_bits(&s->gb, 16) + 1;
             }
+            s->use_last_frame_mvs &= s->frames[LAST_FRAME].tf.f->width == w &&
+                                     s->frames[LAST_FRAME].tf.f->height == h;
             if (get_bits1(&s->gb)) // display size
                 skip_bits(&s->gb, 32);
             s->highprecisionmvs = get_bits1(&s->gb);
-- 
1.8.4