From: Fiona Glaser <fiona@x264.com>
Date: Sat, 23 May 2009 04:28:15 +0000 (-0700)
Subject: Fix bug where satd was incorrectly used with subme<=1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ded0dcd5806440eda4f7ffb072f8e13f8b185171;p=libx264

Fix bug where satd was incorrectly used with subme<=1
Faster subme<=1 with i4x4 enabled.
---

diff --git a/encoder/analyse.c b/encoder/analyse.c
index e55b9609..afa61c6b 100644
--- a/encoder/analyse.c
+++ b/encoder/analyse.c
@@ -786,7 +786,7 @@ static void x264_mb_analyse_intra( x264_t *h, x264_mb_analysis_t *a, int i_satd_
             if( b_merged_satd && i_max >= 6 )
             {
                 int satd[9];
-                h->pixf.intra_satd_x3_4x4( p_src_by, p_dst_by, satd );
+                h->pixf.intra_mbcmp_x3_4x4( p_src_by, p_dst_by, satd );
                 satd[i_pred_mode] -= 3 * a->i_lambda;
                 for( i=2; i>=0; i-- )
                     COPY2_IF_LT( i_best, satd[i] + 4 * a->i_lambda,