Mercurial > libavcodec.hg
diff motion_est_template.c @ 1011:3b7fcfb9c551 libavcodec
bugs
author | michaelni |
---|---|
date | Sat, 18 Jan 2003 01:37:42 +0000 |
parents | 13aec7e50c52 |
children | 5d4c95f323d0 |
line wrap: on
line diff
--- a/motion_est_template.c Fri Jan 17 22:40:00 2003 +0000 +++ b/motion_est_template.c Sat Jan 18 01:37:42 2003 +0000 @@ -160,7 +160,7 @@ if(s->avctx->me_cmp != s->avctx->me_sub_cmp){ CMP_HPEL(dmin, 0, 0, mx, my, size); - if(mx || my) + if(mx || my || size>0) dmin += (mv_penalty[2*mx - pred_x] + mv_penalty[2*my - pred_y])*penalty_factor; } @@ -290,7 +290,7 @@ if(s->avctx->me_cmp != s->avctx->me_sub_cmp){ CMP_QPEL(dmin, 0, 0, mx, my, size); - if(mx || my) + if(mx || my || size>0) dmin += (mv_penalty[4*mx - pred_x] + mv_penalty[4*my - pred_y])*penalty_factor; }