ffmpeg | branch: master | Derek Buitenhuis <[email protected]> | Mon Dec 12 14:33:27 2016 +0000| [5c7f2cf81df06614f255f061850132355a01d75e] | committer: Anton Khirnov
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]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5c7f2cf81df06614f255f061850132355a01d75e --- libavcodec/h264_slice.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 8d79740a7f..1b91088f52 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, _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
