diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-10-16 22:25:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-19 03:51:38 +0100 |
| commit | f8951f4c7af828609174671d00dfd4b25be90b39 (patch) | |
| tree | ad11a03e7c82c4e0da426a8b4ad8747e1b16022a | |
| parent | 2da580a6bbdc326a681b8d8bc404d71987e2d03a (diff) | |
| download | ffmpeg-f8951f4c7af828609174671d00dfd4b25be90b39.tar.gz | |
avcodec/ffv1dec: update progress in case of broken pointer chains
Fixes deadlock
Fixes Ticket4932
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 5063a18f5635008b2a45ada1f8c1e21e20450029)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/ffv1dec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 4b98c52d5e..14eef9af9b 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -935,6 +935,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac else v = buf_p - c->bytestream_start; if (buf_p - c->bytestream_start < v) { av_log(avctx, AV_LOG_ERROR, "Slice pointer chain broken\n"); + ff_thread_report_progress(&f->picture, INT_MAX, 0); return AVERROR_INVALIDDATA; } buf_p -= v; |