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:
8297f56
)
avcodec/ffv1dec: Clear slice coordinates if they are invalid or slice header decoding...
author
Michael Niedermayer
<michael@niedermayer.cc>
Fri, 16 Oct 2015 18:15:48 +0000
(20:15 +0200)
committer
Michael Niedermayer
<michael@niedermayer.cc>
Fri, 16 Oct 2015 19:14:56 +0000
(21:14 +0200)
Fixes Ticket4931
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
a8d5e33
..
c32f717
100644
(file)
--- a/
libavcodec/ffv1dec.c
+++ b/
libavcodec/ffv1dec.c
@@
-408,6
+408,7
@@
static int decode_slice(AVCodecContext *c, void *arg)
if (ff_ffv1_init_slice_state(f, fs) < 0)
return AVERROR(ENOMEM);
if (decode_slice_header(f, fs) < 0) {
+ fs->slice_x = fs->slice_y = fs->slice_height = fs->slice_width = 0;
fs->slice_damaged = 1;
return AVERROR_INVALIDDATA;
}