diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-16 16:48:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-16 16:48:09 +0200 |
| commit | b45a313e97750a498ffb5aaf5391bbf66c23ae59 (patch) | |
| tree | fc981dce24da7992d3785d4ac8f816471b79d195 /libavcodec/ffv1.c | |
| parent | e03077c4321a8eb963b91bb71e4db30f75441672 (diff) | |
| download | android_external_ffmpeg-b45a313e97750a498ffb5aaf5391bbf66c23ae59.tar.gz android_external_ffmpeg-b45a313e97750a498ffb5aaf5391bbf66c23ae59.tar.bz2 android_external_ffmpeg-b45a313e97750a498ffb5aaf5391bbf66c23ae59.zip | |
ffv1dec: fix error concealment for gop>1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ffv1.c')
| -rw-r--r-- | libavcodec/ffv1.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index 3160817cbc..6d44df0b3b 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -1907,6 +1907,8 @@ static int read_header(FFV1Context *f){ fs->ac= f->ac; fs->packed_at_lsb= f->packed_at_lsb; + fs->slice_damaged = 0; + if(f->version == 2){ fs->slice_x = get_symbol(c, state, 0) *f->width ; fs->slice_y = get_symbol(c, state, 0) *f->height; @@ -2026,7 +2028,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac } buf_p -= v; - fs->slice_damaged = 0; if(f->ec){ unsigned crc = av_crc(av_crc_get_table(AV_CRC_32_IEEE), 0, buf_p, v); if(crc){ |