ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Thu Mar 17 21:03:17 2016 +0100| [a7b8a6e704d3bea4a2bf724b6b6a3b1de1b08886] | committer: Michael Niedermayer
avcodec/error_resilience: remove unneeded and disabled code Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a7b8a6e704d3bea4a2bf724b6b6a3b1de1b08886 --- libavcodec/error_resilience.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index 8bd2152..20af436 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; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
