From 9ebcf7699bced12d4b7e326cfbb1f9ffb59ec794 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Sun, 29 May 2011 18:53:42 -0400 Subject: [PATCH] vp8: fix segmentation race during frame-threading. Fixes occasional failure of make fate-vp8-test-vector-010 with frame-multithreading enabled. --- libavcodec/vp8.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 550070649..282d2fdb4 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -1612,7 +1612,7 @@ static int vp8_decode_frame(AVCodecContext *avctx, void *data, int *data_size, s->mv_min.x = -MARGIN; s->mv_max.x = ((s->mb_width - 1) << 6) + MARGIN; - if (prev_frame && s->segmentation.enabled && s->segmentation.update_map) + if (prev_frame && s->segmentation.enabled && !s->segmentation.update_map) ff_thread_await_progress(prev_frame, mb_y, 0); for (mb_x = 0; mb_x < s->mb_width; mb_x++, mb_xy++, mb++) { -- 2.11.0