[FFmpeg-cvslog] vp8: fix segmentation race during frame-threading.

Ronald S. Bultje git at videolan.org
Wed Jun 1 00:30:19 CEST 2011


ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Sun May 29 18:53:42 2011 -0400| [9ebcf7699bced12d4b7e326cfbb1f9ffb59ec794] | committer: Ronald S. Bultje

vp8: fix segmentation race during frame-threading.

Fixes occasional failure of make fate-vp8-test-vector-010 with
frame-multithreading enabled.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ebcf7699bced12d4b7e326cfbb1f9ffb59ec794
---

 libavcodec/vp8.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c
index 5500706..282d2fd 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++) {



More information about the ffmpeg-cvslog mailing list