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-06-29 00:09:55 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
aad42d7941f9d14fcd4a37910ab65585dce02b9b
aad42d79
1 parent
594c1d8b
fix ubuntu14 build warnings
隐藏空白字符变更
内嵌
并排对比
正在显示
8 个修改的文件
包含
12 行增加
和
6 行删除
trunk/research/librtmp/srs_detect_rtmp.c
trunk/research/librtmp/srs_flv_injecter.c
trunk/research/librtmp/srs_flv_parser.c
trunk/research/librtmp/srs_ingest_flv.c
trunk/research/librtmp/srs_ingest_rtmp.c
trunk/research/librtmp/srs_play.c
trunk/src/app/srs_app_dvr.cpp
trunk/src/app/srs_app_dvr.hpp
trunk/research/librtmp/srs_detect_rtmp.c
查看文件 @
aad42d7
...
...
@@ -67,7 +67,7 @@ int main(int argc, char** argv)
" timeout how long to timeout, in seconds, system time.
\n
"
"For example:
\n
"
" %s rtmp://127.0.0.1:1935/live/livestream 3 10
\n
"
,
argv
[
0
]);
argv
[
0
]
,
argv
[
0
]
);
ret
=
1
;
exit
(
ret
);
return
ret
;
...
...
trunk/research/librtmp/srs_flv_injecter.c
查看文件 @
aad42d7
...
...
@@ -60,7 +60,7 @@ int main(int argc, char** argv)
" out_flv_file the inject output file, can be in_flv_file.
\n
"
"For example:
\n
"
" %s ../../doc/source.200kbps.768x320.flv injected.flv
\n
"
,
argv
[
0
]);
argv
[
0
]
,
argv
[
0
]
);
ret
=
1
;
exit
(
ret
);
return
ret
;
...
...
trunk/research/librtmp/srs_flv_parser.c
查看文件 @
aad42d7
...
...
@@ -51,7 +51,7 @@ int main(int argc, char** argv)
" in_flv_file flv file to parse and show.
\n
"
"For example:
\n
"
" %s ../../doc/source.200kbps.768x320.flv
\n
"
,
argv
[
0
]);
argv
[
0
]
,
argv
[
0
]
);
ret
=
1
;
exit
(
ret
);
return
ret
;
...
...
trunk/research/librtmp/srs_ingest_flv.c
查看文件 @
aad42d7
...
...
@@ -67,7 +67,7 @@ int main(int argc, char** argv)
" out_rtmp_url output rtmp url, publish to this url.
\n
"
"For example:
\n
"
" %s -i ../../doc/source.200kbps.768x320.flv -y rtmp://127.0.0.1/live/demo
\n
"
,
argv
[
0
]);
argv
[
0
]
,
argv
[
0
]
);
ret
=
1
;
exit
(
ret
);
return
ret
;
...
...
trunk/research/librtmp/srs_ingest_rtmp.c
查看文件 @
aad42d7
...
...
@@ -53,7 +53,7 @@ int main(int argc, char** argv)
" out_rtmp_url output rtmp url, publish to this url.
\n
"
"For example:
\n
"
" %s -i rtmp://127.0.0.1/live/livestream -y rtmp://127.0.0.1/live/demo
\n
"
,
argv
[
0
]);
argv
[
0
]
,
argv
[
0
]
);
ret
=
1
;
exit
(
ret
);
return
ret
;
...
...
trunk/research/librtmp/srs_play.c
查看文件 @
aad42d7
...
...
@@ -44,7 +44,7 @@ int main(int argc, char** argv)
" rtmp_url RTMP stream url to play
\n
"
"For example:
\n
"
" %s rtmp://127.0.0.1:1935/live/livestream
\n
"
,
argv
[
0
]);
argv
[
0
]
,
argv
[
0
]
);
int
ret
=
1
;
exit
(
ret
);
return
ret
;
...
...
trunk/src/app/srs_app_dvr.cpp
查看文件 @
aad42d7
...
...
@@ -53,6 +53,10 @@ SrsFlvSegment::SrsFlvSegment()
stream_duration
=
0
;
}
SrsFlvSegment
::~
SrsFlvSegment
()
{
}
void
SrsFlvSegment
::
reset
()
{
has_keyframe
=
false
;
...
...
trunk/src/app/srs_app_dvr.hpp
查看文件 @
aad42d7
...
...
@@ -86,6 +86,8 @@ public:
int64_t
stream_previous_pkt_time
;
public
:
SrsFlvSegment
();
virtual
~
SrsFlvSegment
();
public
:
virtual
void
reset
();
};
...
...
请
注册
或
登录
后发表评论