diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2016-03-18 02:11:55 +0100 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-03-18 03:10:16 +0100 |
commit | 5694b2821132fa1da39ec6fc57cb6a8cf356865f (patch) | |
tree | 0a51a3854ca488e25f18cd78e063c294dc0f6ad6 | |
parent | 488e6409df2487a2aedbd5adb5ac3f7e74216588 (diff) | |
download | ffmpeg-5694b2821132fa1da39ec6fc57cb6a8cf356865f.tar.gz |
avcodec/error_resilience: wait for previous frame to be available
This is possibly redundant but its more correct
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r-- | libavcodec/error_resilience.c | 2 |
1 files changed, 2 insertions, 0 deletions
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; |