From: Loren Merritt <pengvado@akuvian.org>
Date: Tue, 25 Mar 2008 13:31:51 +0000 (-0600)
Subject: fix an arithmetic overflow that disabled SEA threshold after finding a mv with SAD... 
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c1c00e6cc02f500de1b955897e60b0f16ebb0ddf;p=libx264

fix an arithmetic overflow that disabled SEA threshold after finding a mv with SAD < mvcost.
---

diff --git a/encoder/me.c b/encoder/me.c
index cd5a9fcc..310c5868 100644
--- a/encoder/me.c
+++ b/encoder/me.c
@@ -498,7 +498,7 @@ me_hex2:
                     int ycost = p_cost_mvy[my<<2];
                     bsad -= ycost;
                     xn = h->pixf.ads[i_pixel]( enc_dc, sums_base + min_x + my * stride, delta,
-                                               cost_fpel_mvx+min_x, xs, width, bsad*17/16 );
+                                               cost_fpel_mvx+min_x, xs, width, X264_MAX(bsad,0)*17/16 );
                     for( i=0; i<xn-2; i+=3 )
                     {
                         uint8_t *ref = p_fref+min_x+my*stride;
@@ -569,7 +569,7 @@ me_hex2:
                 {
                     bcost -= p_cost_mvy[my<<2];
                     xn = h->pixf.ads[i_pixel]( enc_dc, sums_base + min_x + my * stride, delta,
-                                               cost_fpel_mvx+min_x, xs, width, bcost );
+                                               cost_fpel_mvx+min_x, xs, width, X264_MAX(bcost,0) );
                     for( i=0; i<xn-2; i+=3 )
                         COST_MV_X3_ABS( min_x+xs[i],my, min_x+xs[i+1],my, min_x+xs[i+2],my );
                     bcost += p_cost_mvy[my<<2];