Module: libav Branch: release/12 Commit: 1f7d208b0dab17cfec9579121cede7d24ac57666
Author: Derek Buitenhuis <[email protected]> Committer: Anton Khirnov <[email protected]> Date: Mon Dec 12 14:33:27 2016 +0000 h264_slice: Wait for refs to be available before we use them in error concealment This could happen when there was a frame number gap and frame threading was used. Debugging-by: Ronald S. Bultje <[email protected]> Debugging-by: Justin Ruggles <[email protected]> Signed-off-by: Derek Buitenhuis <[email protected]> CC:[email protected] Signed-off-by: Anton Khirnov <[email protected]> (cherry picked from commit 5c7f2cf81df06614f255f061850132355a01d75e) Signed-off-by: Anton Khirnov <[email protected]> --- libavcodec/h264_slice.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 8d79740..1b91088 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -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, _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
