Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2014-03-01 14:09:22 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
517d346a5239a372b6dd8323a1bbece0835a4a62
517d346a
1 parent
4c498b67
change macro for all rtmp protocol files.
显示空白字符变更
内嵌
并排对比
正在显示
7 个修改的文件
包含
12 行增加
和
12 行删除
trunk/src/core/srs_core.hpp
trunk/src/rtmp/srs_protocol_amf0.hpp
trunk/src/rtmp/srs_protocol_handshake.hpp
trunk/src/rtmp/srs_protocol_io.hpp
trunk/src/rtmp/srs_protocol_rtmp.hpp
trunk/src/rtmp/srs_protocol_rtmp_stack.hpp
trunk/src/srs/srs.upp
trunk/src/core/srs_core.hpp
查看文件 @
517d346
...
...
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
// current release version
#define RTMP_SIG_SRS_VERSION "0.9.
6
"
#define RTMP_SIG_SRS_VERSION "0.9.
7
"
// server info.
#define RTMP_SIG_SRS_KEY "srs"
#define RTMP_SIG_SRS_ROLE "origin server"
...
...
trunk/src/rtmp/srs_protocol_amf0.hpp
查看文件 @
517d346
...
...
@@ -21,8 +21,8 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#ifndef SRS_PROTOCOL_AMF0_HPP
#define SRS_PROTOCOL_AMF0_HPP
#ifndef SRS_RTMP_PROTOCOL_AMF0_HPP
#define SRS_RTMP_PROTOCOL_AMF0_HPP
/*
#include <srs_protocol_amf0.hpp>
...
...
trunk/src/rtmp/srs_protocol_handshake.hpp
查看文件 @
517d346
...
...
@@ -21,8 +21,8 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#ifndef SRS_PROTOCOL_HANDSHKAE_HPP
#define SRS_PROTOCOL_HANDSHKAE_HPP
#ifndef SRS_RTMP_PROTOCOL_HANDSHKAE_HPP
#define SRS_RTMP_PROTOCOL_HANDSHKAE_HPP
/*
#include <srs_protocol_handshake.hpp>
...
...
trunk/src/rtmp/srs_protocol_io.hpp
查看文件 @
517d346
...
...
@@ -21,8 +21,8 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#ifndef SRS_PROTOCOL_IO_HPP
#define SRS_PROTOCOL_IO_HPP
#ifndef SRS_RTMP_PROTOCOL_IO_HPP
#define SRS_RTMP_PROTOCOL_IO_HPP
/*
#include <srs_protocol_io.hpp>
...
...
trunk/src/rtmp/srs_protocol_rtmp.hpp
查看文件 @
517d346
...
...
@@ -21,8 +21,8 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#ifndef SRS_PROTOCOL_RTMP_HPP
#define SRS_PROTOCOL_RTMP_HPP
#ifndef SRS_RTMP_PROTOCOL_RTMP_HPP
#define SRS_RTMP_PROTOCOL_RTMP_HPP
/*
#include <srs_protocol_rtmp.hpp>
...
...
trunk/src/rtmp/srs_protocol_rtmp_stack.hpp
查看文件 @
517d346
...
...
@@ -21,8 +21,8 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#ifndef SRS_PROTOCOL_RTMP_STACK_HPP
#define SRS_PROTOCOL_RTMP_STACK_HPP
#ifndef SRS_RTMP_PROTOCOL_RTMP_STACK_HPP
#define SRS_RTMP_PROTOCOL_RTMP_STACK_HPP
/*
#include <srs_protocol_rtmp_stack.hpp>
...
...
trunk/src/srs/srs.upp
查看文件 @
517d346
...
...
@@ -24,7 +24,7 @@ file
..\kernel\srs_kernel_reload.cpp,
..\kernel\srs_kernel_stream.hpp,
..\kernel\srs_kernel_stream.cpp,
rtmp
protocol readonly separator,
rtmp
-protocol readonly separator,
..\rtmp\srs_protocol_amf0.hpp,
..\rtmp\srs_protocol_amf0.cpp,
..\rtmp\srs_protocol_handshake.hpp,
...
...
请
注册
或
登录
后发表评论