diff options
| author | Thomas Guilbert <tguilbert@google.com> | 2017-03-10 00:15:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-08-23 13:15:16 +0200 |
| commit | baa3d3e7d775d9076644df06d88d5f49da436f4f (patch) | |
| tree | ab11ae298c167da0a5d71119c9ca613c302a8316 | |
| parent | a9394ee7ecfdbc27191650c3652389b7bb0be013 (diff) | |
| download | ffmpeg-baa3d3e7d775d9076644df06d88d5f49da436f4f.tar.gz | |
avcodec/vp8: Fix hang with slice threads
Fixes: 447860.webm
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 9bbc73ae9fdedc8789b2b6be65279e9a0ecd7090)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/vp8.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index f0fe0000d8..cff66f40aa 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -2496,8 +2496,10 @@ int vp78_decode_mb_row_sliced(AVCodecContext *avctx, void *tdata, int jobnr, for (mb_y = jobnr; mb_y < s->mb_height; mb_y += num_jobs) { td->thread_mb_pos = mb_y << 16; ret = s->decode_mb_row_no_filter(avctx, tdata, jobnr, threadnr); - if (ret < 0) + if (ret < 0) { + update_pos(td, s->mb_height, INT_MAX & 0xFFFF); return ret; + } if (s->deblock_filter) s->filter_mb_row(avctx, tdata, jobnr, threadnr); update_pos(td, mb_y, INT_MAX & 0xFFFF); |