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/encoder/vp9_ethread.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/encoder/vp9_ethread.c')
| -rw-r--r-- | vp9/encoder/vp9_ethread.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_ethread.c b/vp9/encoder/vp9_ethread.c index 00025b7a1..adb3fd8e8 100644 --- a/vp9/encoder/vp9_ethread.c +++ b/vp9/encoder/vp9_ethread.c @@ -67,7 +67,7 @@ void vp9_encode_tiles_mt(VP9_COMP *cpi) { VP9_COMMON *const cm = &cpi->common; const int tile_cols = 1 << cm->log2_tile_cols; const VPxWorkerInterface *const winterface = vpx_get_worker_interface(); - const int num_workers = MIN(cpi->oxcf.max_threads, tile_cols); + const int num_workers = VPXMIN(cpi->oxcf.max_threads, tile_cols); int i; vp9_init_tile_data(cpi); @@ -80,7 +80,7 @@ void vp9_encode_tiles_mt(VP9_COMP *cpi) { // resolution. if (cpi->use_svc) { int max_tile_cols = get_max_tile_cols(cpi); - allocated_workers = MIN(cpi->oxcf.max_threads, max_tile_cols); + allocated_workers = VPXMIN(cpi->oxcf.max_threads, max_tile_cols); } CHECK_MEM_ERROR(cm, cpi->workers, |