From ee729cc0ed0bdc6d9029ccd21c76bdde09519b45 Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rsbultje@gmail.com>
Date: Sun, 17 Apr 2016 09:28:56 -0400
Subject: vp9: ignore frame_context_index field in key-/intraonly-frames.

Reproduces a bug to remain consistent with libvpx' behaviour.
---
 libavcodec/vp9.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'libavcodec')

diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
index 5c6f176367..cb2a4a2921 100644
--- a/libavcodec/vp9.c
+++ b/libavcodec/vp9.c
@@ -642,6 +642,8 @@ static int decode_frame_header(AVCodecContext *ctx,
     s->s.h.refreshctx   = s->s.h.errorres ? 0 : get_bits1(&s->gb);
     s->s.h.parallelmode = s->s.h.errorres ? 1 : get_bits1(&s->gb);
     s->s.h.framectxid   = c = get_bits(&s->gb, 2);
+    if (s->s.h.keyframe || s->s.h.intraonly)
+        s->s.h.framectxid = 0; // BUG: libvpx ignores this field in keyframes
 
     /* loopfilter header data */
     if (s->s.h.keyframe || s->s.h.errorres || s->s.h.intraonly) {
-- 
cgit v1.2.3