[FFmpeg-cvslog] avcodec/ffv1dec: update progress in case of broken pointer chains
Michael Niedermayer
git at videolan.org
Thu Nov 19 11:27:54 CET 2015
ffmpeg | branch: release/2.6 | Michael Niedermayer <michael at niedermayer.cc> | Fri Oct 16 22:25:20 2015 +0200| [f8951f4c7af828609174671d00dfd4b25be90b39] | committer: Michael Niedermayer
avcodec/ffv1dec: update progress in case of broken pointer chains
Fixes deadlock
Fixes Ticket4932
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 5063a18f5635008b2a45ada1f8c1e21e20450029)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f8951f4c7af828609174671d00dfd4b25be90b39
---
libavcodec/ffv1dec.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
index 4b98c52..14eef9a 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;
More information about the ffmpeg-cvslog
mailing list