Index: source/libvpx/vp9/common/vp9_pred_common.h |
diff --git a/source/libvpx/vp9/common/vp9_pred_common.h b/source/libvpx/vp9/common/vp9_pred_common.h |
index 67b95dbc743cc469f1a08b1e7c613f69520ac547..d56eacfe7f42379ca68fc9b834bda852c99e43ee 100644 |
--- a/source/libvpx/vp9/common/vp9_pred_common.h |
+++ b/source/libvpx/vp9/common/vp9_pred_common.h |
@@ -24,14 +24,14 @@ static INLINE int get_segment_id(const VP9_COMMON *cm, |
const int mi_offset = mi_row * cm->mi_cols + mi_col; |
const int bw = num_8x8_blocks_wide_lookup[bsize]; |
const int bh = num_8x8_blocks_high_lookup[bsize]; |
- const int xmis = MIN(cm->mi_cols - mi_col, bw); |
- const int ymis = MIN(cm->mi_rows - mi_row, bh); |
+ const int xmis = VPXMIN(cm->mi_cols - mi_col, bw); |
+ const int ymis = VPXMIN(cm->mi_rows - mi_row, bh); |
int x, y, segment_id = MAX_SEGMENTS; |
for (y = 0; y < ymis; ++y) |
for (x = 0; x < xmis; ++x) |
- segment_id = MIN(segment_id, |
- segment_ids[mi_offset + y * cm->mi_cols + x]); |
+ segment_id = |
+ VPXMIN(segment_id, segment_ids[mi_offset + y * cm->mi_cols + x]); |
assert(segment_id >= 0 && segment_id < MAX_SEGMENTS); |
return segment_id; |