# HG changeset patch # User michael # Date 1269103896 0 # Node ID 6bf21de8e6ebf866fd2defa396305666c3eaea81 # Parent 927b985f73f41d7fba5c33b1c18c22a39565ef7b Hotfix for regtest-error failure a proper fix appears to require changing h263/mpeg2/motion est to index ref_index like h264. Ill do this change and then revert this hotfix but it will take a bit time. diff -r 927b985f73f4 -r 6bf21de8e6eb error_resilience.c --- a/error_resilience.c Sat Mar 20 00:52:08 2010 +0000 +++ b/error_resilience.c Sat Mar 20 16:51:36 2010 +0000 @@ -486,7 +486,7 @@ sum_x+= mv_predictor[j][0]; sum_y+= mv_predictor[j][1]; sum_r+= ref[j]; - if(j && ref[j] != ref[j-1]) + if(j && ref[j] != ref[j-1] && s->codec_id == CODEC_ID_H264) goto skip_mean_and_median; } @@ -549,7 +549,7 @@ s->current_picture.motion_val[0][mot_index][0]= s->mv[0][0][0]= mv_predictor[j][0]; s->current_picture.motion_val[0][mot_index][1]= s->mv[0][0][1]= mv_predictor[j][1]; - if(ref[j]<0) //predictor intra or otherwise not available + if(ref[j]<0 && s->codec_id == CODEC_ID_H264) //predictor intra or otherwise not available continue; decode_mb(s, ref[j]); @@ -767,6 +767,7 @@ pic->motion_subsample_log2= 3; s->current_picture= *s->current_picture_ptr; } + pic->ref_index[0]= av_realloc(pic->ref_index[0], s->mb_stride * s->mb_height * 4 * sizeof(uint8_t)); if(s->avctx->debug&FF_DEBUG_ER){ for(mb_y=0; mb_ymb_height; mb_y++){