[x264-devel] commit: Re-enable i8x8 merged SATD (Jason Garrett-Glaser )

[git at videolan.org]

x264 | branch: master | Jason Garrett-Glaser <darkshikari at gmail.com> | Fri May 28 14:30:07 2010 -0700| [bdc68d651db64045aecb28f27e0e05e027ab48eb] | committer: Jason Garrett-Glaser 

Re-enable i8x8 merged SATD
Accidentally got disabled when intra_sad_x3 was added.

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

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

diff --git a/encoder/encoder.c b/encoder/encoder.c
index 6e0dc54..7717ea8 100644
--- a/encoder/encoder.c
+++ b/encoder/encoder.c
@@ -810,6 +810,7 @@ static void mbcmp_init( x264_t *h )
     memcpy( h->pixf.mbcmp_unaligned, satd ? h->pixf.satd : h->pixf.sad, sizeof(h->pixf.mbcmp_unaligned) );
     h->pixf.intra_mbcmp_x3_16x16 = satd ? h->pixf.intra_satd_x3_16x16 : h->pixf.intra_sad_x3_16x16;
     h->pixf.intra_mbcmp_x3_8x8c = satd ? h->pixf.intra_satd_x3_8x8c : h->pixf.intra_sad_x3_8x8c;
+    h->pixf.intra_mbcmp_x3_8x8 = satd ? h->pixf.intra_sa8d_x3_8x8 : h->pixf.intra_sad_x3_8x8;
     h->pixf.intra_mbcmp_x3_4x4 = satd ? h->pixf.intra_satd_x3_4x4 : h->pixf.intra_sad_x3_4x4;
     satd &= h->param.analyse.i_me_method == X264_ME_TESA;
     memcpy( h->pixf.fpelcmp, satd ? h->pixf.satd : h->pixf.sad, sizeof(h->pixf.fpelcmp) );