[FFmpeg-cvslog] hevc: fix wpp threading deadlock.
Ronald S. Bultje
git at videolan.org
Fri Oct 9 21:51:51 CEST 2015
ffmpeg | branch: release/2.6 | Ronald S. Bultje <rsbultje at gmail.com> | Sun Sep 20 12:39:14 2015 +0200| [488041cfb05badd62bef1b7e275cb44b4435724f] | committer: Carl Eugen Hoyos
hevc: fix wpp threading deadlock.
Fixes ticket 4258.
(cherry picked from commit 74e4948235bc8f8946eeca20525258bbf383f75d)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=488041cfb05badd62bef1b7e275cb44b4435724f
---
libavcodec/hevc.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index 3f6429f..f3cd4da 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -2379,6 +2379,8 @@ static int hls_decode_entry_wpp(AVCodecContext *avctxt, void *input_ctb_row, int
if (more_data < 0) {
s->tab_slice_address[ctb_addr_rs] = -1;
+ avpriv_atomic_int_set(&s1->wpp_err, 1);
+ ff_thread_report_progress2(s->avctx, ctb_row ,thread, SHIFT_CTB_WPP);
return more_data;
}
More information about the ffmpeg-cvslog
mailing list