From 23b978c0bba41abecc73949e0ba5deacf4c8f756 Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 20 Apr 2015 11:28:46 +0800 Subject: [PATCH] merge from github --- trunk/research/librtmp/srs_ingest_flv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trunk/research/librtmp/srs_ingest_flv.c b/trunk/research/librtmp/srs_ingest_flv.c index ee1cfbdce..78bea934f 100644 --- a/trunk/research/librtmp/srs_ingest_flv.c +++ b/trunk/research/librtmp/srs_ingest_flv.c @@ -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 diff = time - starttime - (now -re); 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) @@ -269,6 +269,6 @@ void re_cleanup(int64_t re, int32_t starttime, u_int32_t time) if (diff > 0) { srs_human_trace("re_cleanup, diff=%d, start=%d, last=%d ms", (int)diff, starttime, time); - usleep(diff * 1000); + usleep((useconds_t)(diff * 1000)); } }