external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

merge from github

Browse source
This commit is contained in:
winlin 2015-04-20 11:28:46 +08:00
parent 623e37e22a
commit 23b978c0bb
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
trunk/research/librtmp/srs_ingest_flv.c
View file

@ -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));
} }
} }