Merge commit '9b30f8dd8fa5bef5f16904cb98745b4a58f8f776'

[ffmpeg] / libavcodec / vp9.c

diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
index 5c6f176367570c39a76c46451efa6f2abf61c779..cb2a4a29212f1618ad0ff104c999f13ba33bc11d 100644 (file)
--- 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) {