From caf6512ac4e31f0e517e26432beb3b0d3cf5aaa8 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Wed, 2 Sep 2015 11:26:24 -0400 Subject: vp9: deal with the case where update_map=0 but we're key/intraonly. --- libavcodec/vp9.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index 7035512242..b1cf929497 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -1479,7 +1479,8 @@ static void decode_mode(AVCodecContext *ctx) if (!s->segmentation.enabled) { b->seg_id = 0; } else if (s->keyframe || s->intraonly) { - b->seg_id = vp8_rac_get_tree(&s->c, vp9_segmentation_tree, s->prob.seg); + b->seg_id = !s->segmentation.update_map ? 0 : + vp8_rac_get_tree(&s->c, vp9_segmentation_tree, s->prob.seg); } else if (!s->segmentation.update_map || (s->segmentation.temporal && vp56_rac_get_prob_branchy(&s->c, -- cgit v1.2.3