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

add dvr option. refine macros of auto headers

Browse source
This commit is contained in:
winlin 2014-04-15 14:01:57 +08:00
parent 1ae9178605
commit 23a1b29935
34 changed files with 242 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

6
trunk/src/rtmp/srs_protocol_handshake.cpp
View file

@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_protocol_utility.hpp>
#include <srs_protocol_rtmp.hpp>
#ifdef SRS_SSL
#ifdef SRS_AUTO_SSL
using namespace srs;
@ -1070,7 +1070,7 @@ SrsComplexHandshake::~SrsComplexHandshake()
{
}
#ifndef SRS_SSL
#ifndef SRS_AUTO_SSL
int SrsComplexHandshake::handshake_with_client(SrsHandshakeBytes* /*hs_bytes*/, ISrsProtocolReaderWriter* /*io*/)
{
srs_trace("directly use simple handshake for ssl disabled.");
@ -1169,7 +1169,7 @@ int SrsComplexHandshake::handshake_with_client(SrsHandshakeBytes* hs_bytes, ISrs
}
#endif
#ifndef SRS_SSL
#ifndef SRS_AUTO_SSL
int SrsComplexHandshake::handshake_with_server(SrsHandshakeBytes* /*hs_bytes*/, ISrsProtocolReaderWriter* /*io*/)
{
return ERROR_RTMP_TRY_SIMPLE_HS;

2
trunk/src/rtmp/srs_protocol_handshake.hpp
View file

@ -34,7 +34,7 @@ class ISrsProtocolReaderWriter;
class SrsComplexHandshake;
class SrsHandshakeBytes;
#ifdef SRS_SSL
#ifdef SRS_AUTO_SSL
namespace srs
{