diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2015-09-02 18:26:24 +0300 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2015-09-04 16:33:44 +0300 |
| commit | caf6512ac4e31f0e517e26432beb3b0d3cf5aaa8 (patch) | |
| tree | fb78403cbdaa6be44519e5cad7205cb5e7ca4552 /libavcodec/vp9.c | |
| parent | 339550e7c80e5ef1d555b72225f1fd4936c3fb70 (diff) | |
vp9: deal with the case where update_map=0 but we're key/intraonly.
Diffstat (limited to 'libavcodec/vp9.c')
| -rw-r--r-- | libavcodec/vp9.c | 3 |
1 files changed, 2 insertions, 1 deletions
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, |