diff options
| author | James Zern <jzern@google.com> | 2015-08-17 18:19:22 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2015-08-26 20:11:32 -0700 |
| commit | 5e16d397bd67b6d870c1ac34f50799f5c2fd6f91 (patch) | |
| tree | 1e31dcc55d3be8c0c98433d60a10c6b7c37dc28a /vp9/common/vp9_common_data.c | |
| parent | 205532f3a76752bec3a8b4d229c5fbf569b29922 (diff) | |
| download | libvpx-5e16d397bd67b6d870c1ac34f50799f5c2fd6f91.tar libvpx-5e16d397bd67b6d870c1ac34f50799f5c2fd6f91.tar.gz libvpx-5e16d397bd67b6d870c1ac34f50799f5c2fd6f91.tar.bz2 libvpx-5e16d397bd67b6d870c1ac34f50799f5c2fd6f91.zip | |
vpx_dsp_common: add VPX prefix to MIN/MAX
prevents redeclaration warnings;
vp8 has its own define which will be resolved in a future commit
Change-Id: Ic941fef3dd4262fcdce48b73075fe6b375f11c9c
Diffstat (limited to 'vp9/common/vp9_common_data.c')
| -rw-r--r-- | vp9/common/vp9_common_data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/common/vp9_common_data.c b/vp9/common/vp9_common_data.c index 0bf7cbcc0..ca7f4ad41 100644 --- a/vp9/common/vp9_common_data.c +++ b/vp9/common/vp9_common_data.c @@ -27,7 +27,7 @@ const uint8_t num_8x8_blocks_wide_lookup[BLOCK_SIZES] = const uint8_t num_8x8_blocks_high_lookup[BLOCK_SIZES] = {1, 1, 1, 1, 2, 1, 2, 4, 2, 4, 8, 4, 8}; -// MIN(3, MIN(b_width_log2(bsize), b_height_log2(bsize))) +// VPXMIN(3, VPXMIN(b_width_log2(bsize), b_height_log2(bsize))) const uint8_t size_group_lookup[BLOCK_SIZES] = {0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 3}; |