[FFmpeg-cvslog] hevc: fix wpp threading deadlock.

[Ronald S. Bultje]

ffmpeg | branch: release/2.2 | Ronald S. Bultje <rsbultje at gmail.com> | Sun Sep 20 12:39:14 2015 +0200| [96f52e22f04f1c19a1e6c24b036684b250fd4706] | 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=96f52e22f04f1c19a1e6c24b036684b250fd4706
---

 libavcodec/hevc.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index 663cd94..cf315b0 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;
         }