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 code

Browse source
This commit is contained in:
winlin 2014-01-11 20:19:18 +08:00
commit 76fa3e91bf
8 changed files with 3751 additions and 3751 deletions
Download patch file Download diff file Expand all files Collapse all files

1
trunk/src/core/srs_core_client.cpp Executable file → Normal file
View file

@ -749,4 +749,3 @@ void SrsClient::on_stop()
}
#endif
}

0
trunk/src/core/srs_core_client.hpp Executable file → Normal file
View file

1
trunk/src/core/srs_core_error.cpp Executable file → Normal file
View file

@ -27,3 +27,4 @@ bool srs_is_system_control_error(int error_code)
{
return error_code == ERROR_CONTROL_RTMP_CLOSE;
}

0
trunk/src/core/srs_core_error.hpp Executable file → Normal file
View file

1
trunk/src/core/srs_core_protocol.cpp Executable file → Normal file
View file

@ -3365,4 +3365,3 @@ int SrsUserControlPacket::encode_packet(SrsStream* stream)
return ret;
}

0
trunk/src/core/srs_core_protocol.hpp Executable file → Normal file
View file

1
trunk/src/core/srs_core_rtmp.cpp Executable file → Normal file
View file

@ -1226,3 +1226,4 @@ int SrsRtmp::identify_play_client(SrsPlayPacket* req, SrsClientType& type, strin
return ret;
}

0
trunk/src/core/srs_core_rtmp.hpp Executable file → Normal file
View file