diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2011-05-29 18:53:42 -0400 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-05-31 07:13:34 -0700 |
| commit | 9ebcf7699bced12d4b7e326cfbb1f9ffb59ec794 (patch) | |
| tree | 6274f0d187f1d54b989ca8f01c1e46a964544aa7 /libavcodec/vp8.c | |
| parent | f635a233e377bedc6a39c9d8923ee3039fa5319f (diff) | |
| download | ffmpeg-9ebcf7699bced12d4b7e326cfbb1f9ffb59ec794.tar.gz | |
vp8: fix segmentation race during frame-threading.
Fixes occasional failure of make fate-vp8-test-vector-010 with
frame-multithreading enabled.
Diffstat (limited to 'libavcodec/vp8.c')
| -rw-r--r-- | libavcodec/vp8.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 5500706494..282d2fdb4e 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++) { |