diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2015-09-20 12:39:14 +0200 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2015-09-21 20:44:14 -0400 |
| commit | 74e4948235bc8f8946eeca20525258bbf383f75d (patch) | |
| tree | 94c31f84b7a264e0ad5f644a9b20031c6f6cf7dd /libavcodec/hevc.c | |
| parent | 350e9c6765f0fd619a31c1a0f71483bf67dfa7bb (diff) | |
| download | ffmpeg-74e4948235bc8f8946eeca20525258bbf383f75d.tar.gz | |
hevc: fix wpp threading deadlock.
Fixes ticket 4258.
Diffstat (limited to 'libavcodec/hevc.c')
| -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 e45f4a4113..02869a078c 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -2401,6 +2401,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; } |