Re-enable i8x8 merged SATD
authorJason Garrett-Glaser <darkshikari@gmail.com>
Fri, 28 May 2010 21:30:07 +0000 (14:30 -0700)
committerJason Garrett-Glaser <darkshikari@gmail.com>
Mon, 31 May 2010 18:43:12 +0000 (11:43 -0700)
Accidentally got disabled when intra_sad_x3 was added.

encoder/encoder.c

index 6e0dc54..7717ea8 100644 (file)
@@ -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) );