aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-10-16 22:25:20 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-10-16 22:25:20 +0200
commit5063a18f5635008b2a45ada1f8c1e21e20450029 (patch)
tree228726fb4595fa90d791fb1547f06800505deca0
parent4c2d4e8700cd3db59bc11ab196c0002215cf601f (diff)
downloadffmpeg-5063a18f5635008b2a45ada1f8c1e21e20450029.tar.gz
avcodec/ffv1dec: update progress in case of broken pointer chains
Fixes deadlock Fixes Ticket4932 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/ffv1dec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
index c32f7178c5..d9e1e73fd6 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;