external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

Merge branch '2.0release' into develop

Browse source
This commit is contained in:
winlin 2016-08-10 22:13:30 +08:00
commit d68a459198
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
trunk/src/libs/srs_lib_simple_socket.cpp
View file

@ -164,8 +164,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
{ {
SrsBlockSyncSocket* skt = (SrsBlockSyncSocket*)ctx; SrsBlockSyncSocket* skt = (SrsBlockSyncSocket*)ctx;
int sec = timeout_us / (1000 * 1000LL); int sec = (int)(timeout_us / 1000000LL);
int microsec = timeout_us / 1000LL % 1000; int microsec = (int)(timeout_us % 1000000LL);
sec = srs_max(0, sec); sec = srs_max(0, sec);
microsec = srs_max(0, microsec); microsec = srs_max(0, microsec);
@ -192,8 +192,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
{ {
SrsBlockSyncSocket* skt = (SrsBlockSyncSocket*)ctx; SrsBlockSyncSocket* skt = (SrsBlockSyncSocket*)ctx;
int sec = timeout_us / (1000 * 1000LL); int sec = (int)(timeout_us / 1000000LL);
int microsec = timeout_us / 1000LL % 1000; int microsec = (int)(timeout_us % 1000000LL);
sec = srs_max(0, sec); sec = srs_max(0, sec);
microsec = srs_max(0, microsec); microsec = srs_max(0, microsec);