vp8: fix segmentation race during frame-threading.

Fixes occasional failure of make fate-vp8-test-vector-010 with frame-multithreading enabled.
14 years ago · 9ebcf7699b
parent f635a233e3
commit 9ebcf7699b
1 changed files with 1 additions and 1 deletions
--- 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++) {