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 e55b96091498a8df7d0ea3fe9f6352ce1cf2271e..afa61c6bdd78a1aa807dbfd13516a5c3a8eb2178 100644 (file)
--- 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,