Index: source/libvpx/vp9/encoder/vp9_sad.c |
=================================================================== |
--- source/libvpx/vp9/encoder/vp9_sad.c (revision 278778) |
+++ source/libvpx/vp9/encoder/vp9_sad.c (working copy) |
@@ -35,14 +35,12 @@ |
#define sadMxN(m, n) \ |
unsigned int vp9_sad##m##x##n##_c(const uint8_t *src, int src_stride, \ |
- const uint8_t *ref, int ref_stride, \ |
- unsigned int max_sad) { \ |
+ const uint8_t *ref, int ref_stride) { \ |
return sad(src, src_stride, ref, ref_stride, m, n); \ |
} \ |
unsigned int vp9_sad##m##x##n##_avg_c(const uint8_t *src, int src_stride, \ |
const uint8_t *ref, int ref_stride, \ |
- const uint8_t *second_pred, \ |
- unsigned int max_sad) { \ |
+ const uint8_t *second_pred) { \ |
uint8_t comp_pred[m * n]; \ |
vp9_comp_avg_pred(comp_pred, second_pred, m, n, ref, ref_stride); \ |
return sad(src, src_stride, comp_pred, m, m, n); \ |
@@ -54,8 +52,7 @@ |
unsigned int *sads) { \ |
int i; \ |
for (i = 0; i < k; ++i) \ |
- sads[i] = vp9_sad##m##x##n##_c(src, src_stride, &ref[i], ref_stride, \ |
- 0x7fffffff); \ |
+ sads[i] = vp9_sad##m##x##n##_c(src, src_stride, &ref[i], ref_stride); \ |
} |
#define sadMxNx4D(m, n) \ |
@@ -64,8 +61,7 @@ |
unsigned int *sads) { \ |
int i; \ |
for (i = 0; i < 4; ++i) \ |
- sads[i] = vp9_sad##m##x##n##_c(src, src_stride, refs[i], ref_stride, \ |
- 0x7fffffff); \ |
+ sads[i] = vp9_sad##m##x##n##_c(src, src_stride, refs[i], ref_stride); \ |
} |
// 64x64 |