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 /vp10/common/thread_common.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 'vp10/common/thread_common.c')
| -rw-r--r-- | vp10/common/thread_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp10/common/thread_common.c b/vp10/common/thread_common.c index 69c6471ff..e87caabd1 100644 --- a/vp10/common/thread_common.c +++ b/vp10/common/thread_common.c @@ -165,7 +165,7 @@ static void loop_filter_rows_mt(YV12_BUFFER_CONFIG *frame, // Decoder may allocate more threads than number of tiles based on user's // input. const int tile_cols = 1 << cm->log2_tile_cols; - const int num_workers = MIN(nworkers, tile_cols); + const int num_workers = VPXMIN(nworkers, tile_cols); int i; if (!lf_sync->sync_range || sb_rows != lf_sync->rows || @@ -229,7 +229,7 @@ void vp10_loop_filter_frame_mt(YV12_BUFFER_CONFIG *frame, if (partial_frame && cm->mi_rows > 8) { start_mi_row = cm->mi_rows >> 1; start_mi_row &= 0xfffffff8; - mi_rows_to_filter = MAX(cm->mi_rows / 8, 8); + mi_rows_to_filter = VPXMAX(cm->mi_rows / 8, 8); } end_mi_row = start_mi_row + mi_rows_to_filter; vp10_loop_filter_frame_init(cm, frame_filter_level); |