# HG changeset patch # User michael # Date 1074047704 0 # Node ID 67949dc3117b3b1e50e364be58c79d432398b01f # Parent fe5e2c14a04cf29cb8f9a78207cfb5580a6acaa3 dont calculate stuff if its not used ... diff -r fe5e2c14a04c -r 67949dc3117b motion_est.c --- a/motion_est.c Wed Jan 14 02:21:39 2004 +0000 +++ b/motion_est.c Wed Jan 14 02:35:04 2004 +0000 @@ -840,7 +840,8 @@ dmin4= s->me.sub_motion_search(s, &mx4, &my4, dmin4, pred_x4, pred_y4, src_data, ref_data, stride, uvstride, size, h, mv_penalty); - if(s->dsp.me_sub_cmp[0] != s->dsp.mb_cmp[0]){ + if(s->dsp.me_sub_cmp[0] != s->dsp.mb_cmp[0] + && s->avctx->mb_decision == FF_MB_DECISION_SIMPLE){ int dxy; const int offset= ((block&1) + (block>>1)*stride)*8; uint8_t *dest_y = s->me.scratchpad + offset; @@ -990,7 +991,8 @@ mv_table[xy][0]= mx_i; mv_table[xy][1]= my_i; - if(s->dsp.me_sub_cmp[0] != s->dsp.mb_cmp[0]){ + if(s->dsp.me_sub_cmp[0] != s->dsp.mb_cmp[0] + && s->avctx->mb_decision == FF_MB_DECISION_SIMPLE){ int dxy; //FIXME chroma ME