diff motion_est_template.c @ 4326:9af83350d4fd libavcodec

test DIRECT{0,0} too if flag mv0 is used slight PSNR/bitrate increase
author michael
date Fri, 22 Dec 2006 23:30:57 +0000
parents 13c897abcab3
children e511820c4a97
line wrap: on
line diff
--- a/motion_est_template.c	Fri Dec 22 10:10:13 2006 +0000
+++ b/motion_est_template.c	Fri Dec 22 23:30:57 2006 +0000
@@ -1025,7 +1025,7 @@
     score_map[0]= dmin;
 
     //FIXME precalc first term below?
-    if((s->pict_type == B_TYPE  || s->flags&CODEC_FLAG_MV0) && !(c->flags & FLAG_DIRECT))
+    if((s->pict_type == B_TYPE && !(c->flags & FLAG_DIRECT)) || s->flags&CODEC_FLAG_MV0)
         dmin += (mv_penalty[pred_x] + mv_penalty[pred_y])*penalty_factor;
 
     /* first line */