| Index: source/config/mac/ia32/vp8_rtcd.h | 
| diff --git a/source/config/mac/ia32/vp8_rtcd.h b/source/config/mac/ia32/vp8_rtcd.h | 
| index 99d12b3984b2c6267958a06c350d5c5310ea232e..b60e7ac730118c8b533daa83d294864199940c86 100644 | 
| --- a/source/config/mac/ia32/vp8_rtcd.h | 
| +++ b/source/config/mac/ia32/vp8_rtcd.h | 
| @@ -241,94 +241,6 @@ void vp8_regular_quantize_b_sse2(struct block *, struct blockd *); | 
| void vp8_regular_quantize_b_sse4_1(struct block *, struct blockd *); | 
| RTCD_EXTERN void (*vp8_regular_quantize_b)(struct block *, struct blockd *); | 
|  | 
| -unsigned int vp8_sad16x16_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad); | 
| -unsigned int vp8_sad16x16_mmx(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad); | 
| -unsigned int vp8_sad16x16_wmt(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad); | 
| -unsigned int vp8_sad16x16_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad); | 
| -RTCD_EXTERN unsigned int (*vp8_sad16x16)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad); | 
| - | 
| -void vp8_sad16x16x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array); | 
| -void vp8_sad16x16x3_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array); | 
| -void vp8_sad16x16x3_ssse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array); | 
| -RTCD_EXTERN void (*vp8_sad16x16x3)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array); | 
| - | 
| -void vp8_sad16x16x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array); | 
| -void vp8_sad16x16x4d_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array); | 
| -RTCD_EXTERN void (*vp8_sad16x16x4d)(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array); | 
| - | 
| -void vp8_sad16x16x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array); | 
| -void vp8_sad16x16x8_sse4(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array); | 
| -RTCD_EXTERN void (*vp8_sad16x16x8)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array); | 
| - | 
| -unsigned int vp8_sad16x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad); | 
| -unsigned int vp8_sad16x8_mmx(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad); | 
| -unsigned int vp8_sad16x8_wmt(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad); | 
| -RTCD_EXTERN unsigned int (*vp8_sad16x8)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad); | 
| - | 
| -void vp8_sad16x8x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array); | 
| -void vp8_sad16x8x3_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array); | 
| -void vp8_sad16x8x3_ssse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array); | 
| -RTCD_EXTERN void (*vp8_sad16x8x3)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array); | 
| - | 
| -void vp8_sad16x8x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array); | 
| -void vp8_sad16x8x4d_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array); | 
| -RTCD_EXTERN void (*vp8_sad16x8x4d)(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array); | 
| - | 
| -void vp8_sad16x8x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array); | 
| -void vp8_sad16x8x8_sse4(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array); | 
| -RTCD_EXTERN void (*vp8_sad16x8x8)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array); | 
| - | 
| -unsigned int vp8_sad4x4_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad); | 
| -unsigned int vp8_sad4x4_mmx(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad); | 
| -unsigned int vp8_sad4x4_wmt(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad); | 
| -RTCD_EXTERN unsigned int (*vp8_sad4x4)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad); | 
| - | 
| -void vp8_sad4x4x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array); | 
| -void vp8_sad4x4x3_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array); | 
| -RTCD_EXTERN void (*vp8_sad4x4x3)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array); | 
| - | 
| -void vp8_sad4x4x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array); | 
| -void vp8_sad4x4x4d_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array); | 
| -RTCD_EXTERN void (*vp8_sad4x4x4d)(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array); | 
| - | 
| -void vp8_sad4x4x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array); | 
| -void vp8_sad4x4x8_sse4(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array); | 
| -RTCD_EXTERN void (*vp8_sad4x4x8)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array); | 
| - | 
| -unsigned int vp8_sad8x16_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad); | 
| -unsigned int vp8_sad8x16_mmx(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad); | 
| -unsigned int vp8_sad8x16_wmt(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad); | 
| -RTCD_EXTERN unsigned int (*vp8_sad8x16)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad); | 
| - | 
| -void vp8_sad8x16x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array); | 
| -void vp8_sad8x16x3_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array); | 
| -RTCD_EXTERN void (*vp8_sad8x16x3)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array); | 
| - | 
| -void vp8_sad8x16x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array); | 
| -void vp8_sad8x16x4d_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array); | 
| -RTCD_EXTERN void (*vp8_sad8x16x4d)(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array); | 
| - | 
| -void vp8_sad8x16x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array); | 
| -void vp8_sad8x16x8_sse4(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array); | 
| -RTCD_EXTERN void (*vp8_sad8x16x8)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array); | 
| - | 
| -unsigned int vp8_sad8x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad); | 
| -unsigned int vp8_sad8x8_mmx(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad); | 
| -unsigned int vp8_sad8x8_wmt(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad); | 
| -RTCD_EXTERN unsigned int (*vp8_sad8x8)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int max_sad); | 
| - | 
| -void vp8_sad8x8x3_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array); | 
| -void vp8_sad8x8x3_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array); | 
| -RTCD_EXTERN void (*vp8_sad8x8x3)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned int *sad_array); | 
| - | 
| -void vp8_sad8x8x4d_c(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array); | 
| -void vp8_sad8x8x4d_sse3(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array); | 
| -RTCD_EXTERN void (*vp8_sad8x8x4d)(const unsigned char *src_ptr, int src_stride, const unsigned char * const ref_ptr[], int  ref_stride, unsigned int *sad_array); | 
| - | 
| -void vp8_sad8x8x8_c(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array); | 
| -void vp8_sad8x8x8_sse4(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array); | 
| -RTCD_EXTERN void (*vp8_sad8x8x8)(const unsigned char *src_ptr, int src_stride, const unsigned char *ref_ptr, int  ref_stride, unsigned short *sad_array); | 
| - | 
| void vp8_short_fdct4x4_c(short *input, short *output, int pitch); | 
| void vp8_short_fdct4x4_mmx(short *input, short *output, int pitch); | 
| void vp8_short_fdct4x4_sse2(short *input, short *output, int pitch); | 
| @@ -589,54 +501,6 @@ static void setup_rtcd_internal(void) | 
| vp8_regular_quantize_b = vp8_regular_quantize_b_c; | 
| if (flags & HAS_SSE2) vp8_regular_quantize_b = vp8_regular_quantize_b_sse2; | 
| if (flags & HAS_SSE4_1) vp8_regular_quantize_b = vp8_regular_quantize_b_sse4_1; | 
| -    vp8_sad16x16 = vp8_sad16x16_c; | 
| -    if (flags & HAS_MMX) vp8_sad16x16 = vp8_sad16x16_mmx; | 
| -    if (flags & HAS_SSE2) vp8_sad16x16 = vp8_sad16x16_wmt; | 
| -    if (flags & HAS_SSE3) vp8_sad16x16 = vp8_sad16x16_sse3; | 
| -    vp8_sad16x16x3 = vp8_sad16x16x3_c; | 
| -    if (flags & HAS_SSE3) vp8_sad16x16x3 = vp8_sad16x16x3_sse3; | 
| -    if (flags & HAS_SSSE3) vp8_sad16x16x3 = vp8_sad16x16x3_ssse3; | 
| -    vp8_sad16x16x4d = vp8_sad16x16x4d_c; | 
| -    if (flags & HAS_SSE3) vp8_sad16x16x4d = vp8_sad16x16x4d_sse3; | 
| -    vp8_sad16x16x8 = vp8_sad16x16x8_c; | 
| -    if (flags & HAS_SSE4_1) vp8_sad16x16x8 = vp8_sad16x16x8_sse4; | 
| -    vp8_sad16x8 = vp8_sad16x8_c; | 
| -    if (flags & HAS_MMX) vp8_sad16x8 = vp8_sad16x8_mmx; | 
| -    if (flags & HAS_SSE2) vp8_sad16x8 = vp8_sad16x8_wmt; | 
| -    vp8_sad16x8x3 = vp8_sad16x8x3_c; | 
| -    if (flags & HAS_SSE3) vp8_sad16x8x3 = vp8_sad16x8x3_sse3; | 
| -    if (flags & HAS_SSSE3) vp8_sad16x8x3 = vp8_sad16x8x3_ssse3; | 
| -    vp8_sad16x8x4d = vp8_sad16x8x4d_c; | 
| -    if (flags & HAS_SSE3) vp8_sad16x8x4d = vp8_sad16x8x4d_sse3; | 
| -    vp8_sad16x8x8 = vp8_sad16x8x8_c; | 
| -    if (flags & HAS_SSE4_1) vp8_sad16x8x8 = vp8_sad16x8x8_sse4; | 
| -    vp8_sad4x4 = vp8_sad4x4_c; | 
| -    if (flags & HAS_MMX) vp8_sad4x4 = vp8_sad4x4_mmx; | 
| -    if (flags & HAS_SSE2) vp8_sad4x4 = vp8_sad4x4_wmt; | 
| -    vp8_sad4x4x3 = vp8_sad4x4x3_c; | 
| -    if (flags & HAS_SSE3) vp8_sad4x4x3 = vp8_sad4x4x3_sse3; | 
| -    vp8_sad4x4x4d = vp8_sad4x4x4d_c; | 
| -    if (flags & HAS_SSE3) vp8_sad4x4x4d = vp8_sad4x4x4d_sse3; | 
| -    vp8_sad4x4x8 = vp8_sad4x4x8_c; | 
| -    if (flags & HAS_SSE4_1) vp8_sad4x4x8 = vp8_sad4x4x8_sse4; | 
| -    vp8_sad8x16 = vp8_sad8x16_c; | 
| -    if (flags & HAS_MMX) vp8_sad8x16 = vp8_sad8x16_mmx; | 
| -    if (flags & HAS_SSE2) vp8_sad8x16 = vp8_sad8x16_wmt; | 
| -    vp8_sad8x16x3 = vp8_sad8x16x3_c; | 
| -    if (flags & HAS_SSE3) vp8_sad8x16x3 = vp8_sad8x16x3_sse3; | 
| -    vp8_sad8x16x4d = vp8_sad8x16x4d_c; | 
| -    if (flags & HAS_SSE3) vp8_sad8x16x4d = vp8_sad8x16x4d_sse3; | 
| -    vp8_sad8x16x8 = vp8_sad8x16x8_c; | 
| -    if (flags & HAS_SSE4_1) vp8_sad8x16x8 = vp8_sad8x16x8_sse4; | 
| -    vp8_sad8x8 = vp8_sad8x8_c; | 
| -    if (flags & HAS_MMX) vp8_sad8x8 = vp8_sad8x8_mmx; | 
| -    if (flags & HAS_SSE2) vp8_sad8x8 = vp8_sad8x8_wmt; | 
| -    vp8_sad8x8x3 = vp8_sad8x8x3_c; | 
| -    if (flags & HAS_SSE3) vp8_sad8x8x3 = vp8_sad8x8x3_sse3; | 
| -    vp8_sad8x8x4d = vp8_sad8x8x4d_c; | 
| -    if (flags & HAS_SSE3) vp8_sad8x8x4d = vp8_sad8x8x4d_sse3; | 
| -    vp8_sad8x8x8 = vp8_sad8x8x8_c; | 
| -    if (flags & HAS_SSE4_1) vp8_sad8x8x8 = vp8_sad8x8x8_sse4; | 
| vp8_short_fdct4x4 = vp8_short_fdct4x4_c; | 
| if (flags & HAS_MMX) vp8_short_fdct4x4 = vp8_short_fdct4x4_mmx; | 
| if (flags & HAS_SSE2) vp8_short_fdct4x4 = vp8_short_fdct4x4_sse2; | 
|  |