summaryrefslogtreecommitdiff
path: root/libavcodec/vp9.c
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2015-09-04 13:46:34 -0400
committerRonald S. Bultje <rsbultje@gmail.com>2015-09-05 15:50:00 -0400
commit3d7173b509656b272462766e72ea1d987512320d (patch)
tree36ee889d6c66c70b2e031a42a37b83fcc7b91634 /libavcodec/vp9.c
parent89b0a9f3fa9d6f32d99d03473ab1cb2110a7c9dd (diff)
vp9: always sync segmentation.feat between threads.
Diffstat (limited to 'libavcodec/vp9.c')
-rw-r--r--libavcodec/vp9.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
index 238185af20..e6c5389caa 100644
--- a/libavcodec/vp9.c
+++ b/libavcodec/vp9.c
@@ -4340,10 +4340,8 @@ static int vp9_decode_update_thread_context(AVCodecContext *dst, const AVCodecCo
s->bpp_index = ssrc->bpp_index;
memcpy(&s->prob_ctx, &ssrc->prob_ctx, sizeof(s->prob_ctx));
memcpy(&s->lf_delta, &ssrc->lf_delta, sizeof(s->lf_delta));
- if (ssrc->segmentation.enabled) {
- memcpy(&s->segmentation.feat, &ssrc->segmentation.feat,
- sizeof(s->segmentation.feat));
- }
+ memcpy(&s->segmentation.feat, &ssrc->segmentation.feat,
+ sizeof(s->segmentation.feat));
return 0;
}