From 3d7173b509656b272462766e72ea1d987512320d Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Fri, 4 Sep 2015 13:46:34 -0400 Subject: vp9: always sync segmentation.feat between threads. --- libavcodec/vp9.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'libavcodec/vp9.c') 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; } -- cgit v1.2.3