diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-03-17 21:03:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-03-18 03:11:16 +0100 |
| commit | a7b8a6e704d3bea4a2bf724b6b6a3b1de1b08886 (patch) | |
| tree | 573d04f6a001cea664e16f6b45c1f0764b139f83 /libavcodec/error_resilience.c | |
| parent | 5694b2821132fa1da39ec6fc57cb6a8cf356865f (diff) | |
| download | ffmpeg-a7b8a6e704d3bea4a2bf724b6b6a3b1de1b08886.tar.gz | |
avcodec/error_resilience: remove unneeded and disabled code
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/error_resilience.c')
| -rw-r--r-- | libavcodec/error_resilience.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index 8bd215263f..20af4360eb 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -582,24 +582,9 @@ skip_mean_and_median: /* zero MV */ pred_count++; - if (!fixed[mb_xy] && 0) { - if (s->avctx->codec_id == AV_CODEC_ID_H264) { - // FIXME - } else { - ff_thread_await_progress(s->last_pic.tf, - mb_y, 0); - } - if (!s->last_pic.motion_val[0] || - !s->last_pic.ref_index[0]) - goto skip_last_mv; - prev_x = s->last_pic.motion_val[0][mot_index][0]; - prev_y = s->last_pic.motion_val[0][mot_index][1]; - prev_ref = s->last_pic.ref_index[0][4 * mb_xy]; - } else { - prev_x = s->cur_pic.motion_val[0][mot_index][0]; - prev_y = s->cur_pic.motion_val[0][mot_index][1]; - prev_ref = s->cur_pic.ref_index[0][4 * mb_xy]; - } + prev_x = s->cur_pic.motion_val[0][mot_index][0]; + prev_y = s->cur_pic.motion_val[0][mot_index][1]; + prev_ref = s->cur_pic.ref_index[0][4 * mb_xy]; /* last MV */ mv_predictor[pred_count][0] = prev_x; |