From 5694b2821132fa1da39ec6fc57cb6a8cf356865f Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 18 Mar 2016 02:11:55 +0100 Subject: avcodec/error_resilience: wait for previous frame to be available This is possibly redundant but its more correct Signed-off-by: Michael Niedermayer --- libavcodec/error_resilience.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index 5a75faddf5..8bd215263f 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -393,6 +393,8 @@ static void guess_mv(ERContext *s) set_mv_strides(s, &mot_step, &mot_stride); num_avail = 0; + if (s->last_pic.motion_val[0]) + ff_thread_await_progress(s->last_pic.tf, mb_height-1, 0); for (i = 0; i < mb_width * mb_height; i++) { const int mb_xy = s->mb_index2xy[i]; int f = 0; -- cgit v1.2.3