mirror of https://git.ffmpeg.org/ffmpeg.git
motion_est: remove dead code
mb_type is initialized to 0 and never updated before the check. Bug-Id: CID 1238782
This commit is contained in:
parent
351d0f8b7a
commit
240b22afe1
|
@ -949,27 +949,7 @@ void ff_estimate_p_frame_motion(MpegEncContext * s,
|
|||
pic->mc_mb_var[s->mb_stride * mb_y + mb_x] = (vard+128)>>8;
|
||||
c->mc_mb_var_sum_temp += (vard+128)>>8;
|
||||
|
||||
if(mb_type){
|
||||
int p_score= FFMIN(vard, varc-500+(s->lambda2>>FF_LAMBDA_SHIFT)*100);
|
||||
int i_score= varc-500+(s->lambda2>>FF_LAMBDA_SHIFT)*20;
|
||||
c->scene_change_score+= ff_sqrt(p_score) - ff_sqrt(i_score);
|
||||
|
||||
if(mb_type == CANDIDATE_MB_TYPE_INTER){
|
||||
c->sub_motion_search(s, &mx, &my, dmin, 0, 0, 0, 16);
|
||||
set_p_mv_tables(s, mx, my, 1);
|
||||
}else{
|
||||
mx <<=shift;
|
||||
my <<=shift;
|
||||
}
|
||||
if(mb_type == CANDIDATE_MB_TYPE_INTER4V){
|
||||
h263_mv4_search(s, mx, my, shift);
|
||||
|
||||
set_p_mv_tables(s, mx, my, 0);
|
||||
}
|
||||
if(mb_type == CANDIDATE_MB_TYPE_INTER_I){
|
||||
interlaced_search(s, 0, s->p_field_mv_table, s->p_field_select_table, mx, my, 1);
|
||||
}
|
||||
}else if(c->avctx->mb_decision > FF_MB_DECISION_SIMPLE){
|
||||
if (c->avctx->mb_decision > FF_MB_DECISION_SIMPLE) {
|
||||
int p_score= FFMIN(vard, varc-500+(s->lambda2>>FF_LAMBDA_SHIFT)*100);
|
||||
int i_score= varc-500+(s->lambda2>>FF_LAMBDA_SHIFT)*20;
|
||||
c->scene_change_score+= ff_sqrt(p_score) - ff_sqrt(i_score);
|
||||
|
|
Loading…
Reference in New Issue