round esa range to a multiple of 4

git-svn-id: svn://svn.videolan.org/x264/trunk@716 df754926-b1dd-0310-bc7b-ec298dee348c

diff --git a/encoder/me.c b/encoder/me.c
index dbc851bf27882b1676c91c2ff8497bcb795daff9..66017c76c5be1de13bcf124210be50887e45378b 100644 (file)
--- a/encoder/me.c
+++ b/encoder/me.c
@@ -454,10 +454,10 @@ me_hex2:
 
     case X264_ME_ESA:
         {
-            const int min_x = X264_MAX( bmx - i_me_range, mv_x_min);
-            const int min_y = X264_MAX( bmy - i_me_range, mv_y_min);
-            const int max_x = X264_MIN( bmx + i_me_range, mv_x_max);
-            const int max_y = X264_MIN( bmy + i_me_range, mv_y_max);
+            const int min_x = X264_MAX( bmx - i_me_range, mv_x_min );
+            const int min_y = X264_MAX( bmy - i_me_range, mv_y_min );
+            const int max_x = ((X264_MIN( bmx + i_me_range, mv_x_max ) - min_x + 3) & ~3) + min_x - 1;
+            const int max_y = X264_MIN( bmy + i_me_range, mv_y_max );
             int mx, my;
 #if 0
             /* plain old exhaustive search */