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 22:53:29 +0200 |
| commit | 96f52e22f04f1c19a1e6c24b036684b250fd4706 (patch) | |
| tree | f9a20d303da7eac6b3f7428d2d31e211e4728e6f | |
| parent | fd7e170507f4656a966ddd2a57db230779f96ba7 (diff) | |
| download | ffmpeg-96f52e22f04f1c19a1e6c24b036684b250fd4706.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 663cd944ef..cf315b0fd5 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -2038,6 +2038,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; } |