diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2015-09-20 12:39:14 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-10-09 21:33:35 +0200 |
| commit | f7cb979766e8edfa7b16a08dc9855d6a46b16353 (patch) | |
| tree | 9803abf95d638ff864de22a0b61692473ef013a8 | |
| parent | 0fb4a85603b10776107e411b0bc2d9c8898424c5 (diff) | |
| download | ffmpeg-f7cb979766e8edfa7b16a08dc9855d6a46b16353.tar.gz | |
hevc: fix wpp threading deadlock.
Fixes ticket 4258.
(cherry picked from commit 74e4948235bc8f8946eeca20525258bbf383f75d)
| -rw-r--r-- | libavcodec/hevc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index a56063f8fd..cbcb87dbe5 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -2385,6 +2385,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; } |