diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-10-16 22:25:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-10-30 17:55:31 +0100 |
| commit | c8a1324d1ecddbfd4a64b7592dfc17227c82c478 (patch) | |
| tree | fbf4627105719fe17749b72ed29c492ddd611467 | |
| parent | 6a0e10ae0df13c27e9bf58949488460771358e76 (diff) | |
| download | ffmpeg-c8a1324d1ecddbfd4a64b7592dfc17227c82c478.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 aefdf81122..b6c5e57516 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -940,6 +940,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; |