[x264-devel] commit: Fix bug where satd was incorrectly used with subme<=1 ( Jason Garrett-Glaser )

[git version control]

x264 | branch: master | Jason Garrett-Glaser <darkshikari at gmail.com> | Fri May 22 21:28:15 2009 -0700| [37241b84054d5d012994c4567270c1b32dd9a038] | committer: Jason Garrett-Glaser 

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

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=37241b84054d5d012994c4567270c1b32dd9a038
---

 encoder/analyse.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/encoder/analyse.c b/encoder/analyse.c
index fa21021..7ec43c8 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,