merge from github

@@ -257,7 +257,7 @@ void re_update(int64_t re, int32_t starttime, u_int32_t time)
     int64_t now = srs_utils_time_ms();
     int64_t now = srs_utils_time_ms();
     int64_t diff = time - starttime - (now -re);
     int64_t diff = time - starttime - (now -re);
     if (diff > RE_PULSE_MS) {
     if (diff > RE_PULSE_MS) {
-        usleep(diff * 1000);
+        usleep((useconds_t)(diff * 1000));
     }
     }
 }
 }
 void re_cleanup(int64_t re, int32_t starttime, u_int32_t time)
 void re_cleanup(int64_t re, int32_t starttime, u_int32_t time)
@@ -269,6 +269,6 @@ void re_cleanup(int64_t re, int32_t starttime, u_int32_t time)
     if (diff > 0) {
     if (diff > 0) {
         srs_human_trace("re_cleanup, diff=%d, start=%d, last=%d ms", 
         srs_human_trace("re_cleanup, diff=%d, start=%d, last=%d ms", 
             (int)diff, starttime, time);
             (int)diff, starttime, time);
-        usleep(diff * 1000);
+        usleep((useconds_t)(diff * 1000));
     }
     }
 }
 }