OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4c2d4e8
)
avcodec/ffv1dec: update progress in case of broken pointer chains
author
Michael Niedermayer
<michael@niedermayer.cc>
Fri, 16 Oct 2015 20:25:20 +0000
(22:25 +0200)
committer
Michael Niedermayer
<michael@niedermayer.cc>
Fri, 16 Oct 2015 20:25:20 +0000
(22:25 +0200)
Fixes deadlock
Fixes Ticket4932
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/ffv1dec.c
patch
|
blob
|
history
diff --git
a/libavcodec/ffv1dec.c
b/libavcodec/ffv1dec.c
index
c32f717
..
d9e1e73
100644
(file)
--- 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;