libvpx: Pull from upstream

source/libvpx/vp9/common/vp9_thread_common.c

Index: source/libvpx/vp9/common/vp9_thread_common.c
diff --git a/source/libvpx/vp9/common/vp9_thread_common.c b/source/libvpx/vp9/common/vp9_thread_common.c
index 6b11c93cc0c386b9e9da55ddb690d5b221054d21..2e6285a42fe4943c1932ebeb3c3eaa22f62d36d3 100644
--- a/source/libvpx/vp9/common/vp9_thread_common.c
+++ b/source/libvpx/vp9/common/vp9_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 vp9_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;
   vp9_loop_filter_frame_init(cm, frame_filter_level);