Mercurial > libavcodec.hg
comparison motion_est_template.c @ 1011:3b7fcfb9c551 libavcodec
bugs
author | michaelni |
---|---|
date | Sat, 18 Jan 2003 01:37:42 +0000 |
parents | 13aec7e50c52 |
children | 5d4c95f323d0 |
comparison
equal
deleted
inserted
replaced
1010:3c110cba4b29 | 1011:3b7fcfb9c551 |
---|---|
158 return dmin; | 158 return dmin; |
159 } | 159 } |
160 | 160 |
161 if(s->avctx->me_cmp != s->avctx->me_sub_cmp){ | 161 if(s->avctx->me_cmp != s->avctx->me_sub_cmp){ |
162 CMP_HPEL(dmin, 0, 0, mx, my, size); | 162 CMP_HPEL(dmin, 0, 0, mx, my, size); |
163 if(mx || my) | 163 if(mx || my || size>0) |
164 dmin += (mv_penalty[2*mx - pred_x] + mv_penalty[2*my - pred_y])*penalty_factor; | 164 dmin += (mv_penalty[2*mx - pred_x] + mv_penalty[2*my - pred_y])*penalty_factor; |
165 } | 165 } |
166 | 166 |
167 if (mx > xmin && mx < xmax && | 167 if (mx > xmin && mx < xmax && |
168 my > ymin && my < ymax) { | 168 my > ymin && my < ymax) { |
288 return dmin; | 288 return dmin; |
289 } | 289 } |
290 | 290 |
291 if(s->avctx->me_cmp != s->avctx->me_sub_cmp){ | 291 if(s->avctx->me_cmp != s->avctx->me_sub_cmp){ |
292 CMP_QPEL(dmin, 0, 0, mx, my, size); | 292 CMP_QPEL(dmin, 0, 0, mx, my, size); |
293 if(mx || my) | 293 if(mx || my || size>0) |
294 dmin += (mv_penalty[4*mx - pred_x] + mv_penalty[4*my - pred_y])*penalty_factor; | 294 dmin += (mv_penalty[4*mx - pred_x] + mv_penalty[4*my - pred_y])*penalty_factor; |
295 } | 295 } |
296 | 296 |
297 if (mx > xmin && mx < xmax && | 297 if (mx > xmin && mx < xmax && |
298 my > ymin && my < ymax) { | 298 my > ymin && my < ymax) { |