OSDN Git Service

ffv1dec: fix error concealment for gop>1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Jul 2012 14:48:09 +0000 (16:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Jul 2012 14:48:09 +0000 (16:48 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ffv1.c

index 3160817..6d44df0 100644 (file)
@@ -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){