h264_slice: Wait for refs to be available before we use them in error concealment
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 12 Dec 2016 14:33:27 +0000 (14:33 +0000)
committerAnton Khirnov <anton@khirnov.net>
Wed, 14 Dec 2016 09:38:15 +0000 (10:38 +0100)
This could happen when there was a frame number gap and frame threading was used.

Debugging-by: Ronald S. Bultje <rsbultje@gmail.com>
Debugging-by: Justin Ruggles <justin.ruggles@gmail.com>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
libavcodec/h264_slice.c

index 8d79740..1b91088 100644 (file)
@@ -1404,6 +1404,9 @@ static int h264_field_start(H264Context *h, const H264SliceContext *sl,
                 h->short_ref[0]->f->width == prev->f->width &&
                 h->short_ref[0]->f->height == prev->f->height &&
                 h->short_ref[0]->f->format == prev->f->format) {
+                ff_thread_await_progress(&prev->tf, INT_MAX, 0);
+                if (prev->field_picture)
+                    ff_thread_await_progress(&prev->tf, INT_MAX, 1);
                 av_image_copy(h->short_ref[0]->f->data,
                               h->short_ref[0]->f->linesize,
                               (const uint8_t **)prev->f->data,