aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/ffv1.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-07-16 15:40:39 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-07-16 15:48:04 +0200
commitf5af3568f6408b559a6f97c09a376a27f36ccfb8 (patch)
tree47479cf3d2627f686fbb9f86ac57c8cac0b4e2d7 /libavcodec/ffv1.c
parent094845aad8c007a5382b0c09d72b71e458476822 (diff)
downloadandroid_external_ffmpeg-f5af3568f6408b559a6f97c09a376a27f36ccfb8.tar.gz
android_external_ffmpeg-f5af3568f6408b559a6f97c09a376a27f36ccfb8.tar.bz2
android_external_ffmpeg-f5af3568f6408b559a6f97c09a376a27f36ccfb8.zip
ffv1dec: keep track of errors in slice headers for EC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ffv1.c')
-rw-r--r--libavcodec/ffv1.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index 4bf29f7bd0..f03ea8ea1b 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -1610,8 +1610,10 @@ static int decode_slice(AVCodecContext *c, void *arg){
if(f->version > 2){
if(init_slice_state(f, fs) < 0)
return AVERROR(ENOMEM);
- if(decode_slice_header(f, fs) < 0)
+ if(decode_slice_header(f, fs) < 0) {
+ fs->slice_damaged = 1;
return AVERROR_INVALIDDATA;
+ }
}
if(init_slice_state(f, fs) < 0)
return AVERROR(ENOMEM);