diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-03-23 02:17:04 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-03-23 02:17:04 +0000 |
| commit | fc4a2d1e8cc06766677d33f4ba4777e256a709fc (patch) | |
| tree | 8f9367153e7bae75ded7c2ba79bc088167507feb /libavcodec/error_resilience.c | |
| parent | 19de452a630f0906ef3ebda4f27ca7b2a4b59f07 (diff) | |
Change ref_index structure so it matches how its organized in h264.
Also revert the related error concealment hotfix.
Originally committed as revision 22640 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/error_resilience.c')
| -rw-r--r-- | libavcodec/error_resilience.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index 5dd52ebaf8..fffe19cca3 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -486,7 +486,7 @@ int score_sum=0; sum_x+= mv_predictor[j][0]; sum_y+= mv_predictor[j][1]; sum_r+= ref[j]; - if(j && ref[j] != ref[j-1] && s->codec_id == CODEC_ID_H264) + if(j && ref[j] != ref[j-1]) goto skip_mean_and_median; } @@ -549,7 +549,7 @@ skip_mean_and_median: 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 && s->codec_id == CODEC_ID_H264) //predictor intra or otherwise not available + if(ref[j]<0) //predictor intra or otherwise not available continue; decode_mb(s, ref[j]); @@ -767,7 +767,6 @@ void ff_er_frame_end(MpegEncContext *s){ 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_y<s->mb_height; mb_y++){ |