1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

vp9: deal with the case where update_map=0 but we're key/intraonly.

This commit is contained in:
Ronald S. Bultje 2015-09-02 11:26:24 -04:00
parent 339550e7c8
commit caf6512ac4

View File

@ -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,