diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-07 03:39:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-07 05:11:25 +0100 |
| commit | eff2399f240db76b713b694508cdc8be175ab9fd (patch) | |
| tree | a66444b49379a9d1288f8080a7b8d83d4b8d7f5c | |
| parent | 6df42f98746be06c883ce683563e07c9a2af983f (diff) | |
| download | ffmpeg-eff2399f240db76b713b694508cdc8be175ab9fd.tar.gz | |
Revert "error_resilience: initialize s->block_index[]."
This reverts commit 6193ff68549ecbaf1a4d63a0e06964ec580ac620.
This change is unneeded.
| -rw-r--r-- | libavcodec/error_resilience.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index 35825581af..1c1420f93c 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -440,14 +440,9 @@ static void guess_mv(MpegEncContext *s) if ((!(s->avctx->error_concealment&FF_EC_GUESS_MVS)) || num_avail <= mb_width / 2) { for (mb_y = 0; mb_y < s->mb_height; mb_y++) { - s->mb_x = 0; - s->mb_y = mb_y; - ff_init_block_index(s); for (mb_x = 0; mb_x < s->mb_width; mb_x++) { const int mb_xy = mb_x + mb_y * s->mb_stride; - ff_update_block_index(s); - if (IS_INTRA(s->current_picture.f.mb_type[mb_xy])) continue; if (!(s->error_status_table[mb_xy] & ER_MV_ERROR)) @@ -482,9 +477,6 @@ static void guess_mv(MpegEncContext *s) changed = 0; for (mb_y = 0; mb_y < s->mb_height; mb_y++) { - s->mb_x = 0; - s->mb_y = mb_y; - ff_init_block_index(s); for (mb_x = 0; mb_x < s->mb_width; mb_x++) { const int mb_xy = mb_x + mb_y * s->mb_stride; int mv_predictor[8][2] = { { 0 } }; @@ -496,8 +488,6 @@ static void guess_mv(MpegEncContext *s) const int mot_index = (mb_x + mb_y * mot_stride) * mot_step; int prev_x, prev_y, prev_ref; - ff_update_block_index(s); - if ((mb_x ^ mb_y ^ pass) & 1) continue; @@ -1108,16 +1098,11 @@ void ff_er_frame_end(MpegEncContext *s) /* handle inter blocks with damaged AC */ for (mb_y = 0; mb_y < s->mb_height; mb_y++) { - s->mb_x = 0; - s->mb_y = mb_y; - ff_init_block_index(s); for (mb_x = 0; mb_x < s->mb_width; mb_x++) { const int mb_xy = mb_x + mb_y * s->mb_stride; const int mb_type = s->current_picture.f.mb_type[mb_xy]; int dir = !s->last_picture.f.data[0]; - ff_update_block_index(s); - error = s->error_status_table[mb_xy]; if (IS_INTRA(mb_type)) @@ -1155,16 +1140,11 @@ void ff_er_frame_end(MpegEncContext *s) /* guess MVs */ if (s->pict_type == AV_PICTURE_TYPE_B) { for (mb_y = 0; mb_y < s->mb_height; mb_y++) { - s->mb_x = 0; - s->mb_y = mb_y; - ff_init_block_index(s); for (mb_x = 0; mb_x < s->mb_width; mb_x++) { int xy = mb_x * 2 + mb_y * 2 * s->b8_stride; const int mb_xy = mb_x + mb_y * s->mb_stride; const int mb_type = s->current_picture.f.mb_type[mb_xy]; - ff_update_block_index(s); - error = s->error_status_table[mb_xy]; if (IS_INTRA(mb_type)) |