generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hevc: fix wpp threading deadlock.

Browse Source 
Fixes ticket 4258.
(cherry picked from commit 74e4948235)
This commit is contained in:
Ronald S. Bultje
2015-09-20 12:39:14 +02:00
committed by Carl Eugen Hoyos
parent 6e629b0b66
commit f085ce3265
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/hevc.c
View File

@@ -2368,6 +2368,8 @@ static int hls_decode_entry_wpp(AVCodecContext *avctxt, void *input_ctb_row, int
if (more_data < 0) { if (more_data < 0) {
s->tab_slice_address[ctb_addr_rs] = -1; 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; return more_data;
} }