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
2015-06-10 13:53:13 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
6941f2c072b35ff46b8c91264f9afa5b1469d074
6941f2c0
1 parent
8e8c8108
fix #424, fix aggregate timestamp bug. 2.0.174
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
4 行增加
和
2 行删除
README.md
trunk/src/app/srs_app_source.cpp
trunk/src/core/srs_core.hpp
README.md
查看文件 @
6941f2c
...
...
@@ -344,6 +344,7 @@ Remark:
### SRS 2.0 history
*
v2.0, 2015-06-10, fix
[
#424
](
https://github.com/simple-rtmp-server/srs/issues/424
)
fix aggregate timestamp bug. 2.0.174
*
v2.0, 2015-06-06, fix
[
#421
](
https://github.com/simple-rtmp-server/srs/issues/421
)
drop video for unkown RTMP header.
*
v2.0, 2015-06-05, fix
[
#420
](
https://github.com/simple-rtmp-server/srs/issues/420
)
remove ts for hls ram mode.
*
v2.0, 2015-05-30, fix
[
#209
](
https://github.com/simple-rtmp-server/srs/issues/209
)
cleanup hls when stop and timeout. 2.0.173.
...
...
trunk/src/app/srs_app_source.cpp
查看文件 @
6941f2c
...
...
@@ -1922,7 +1922,8 @@ int SrsSource::on_aggregate(SrsCommonMessage* msg)
timestamp
&=
0x7FFFFFFF
;
// adjust abs timestamp in aggregate msg.
if
(
delta
<
0
)
{
// only -1 means uninitialized delta.
if
(
delta
==
-
1
)
{
delta
=
(
int
)
msg
->
header
.
timestamp
-
(
int
)
timestamp
;
}
timestamp
+=
delta
;
...
...
trunk/src/core/srs_core.hpp
查看文件 @
6941f2c
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR 2
#define VERSION_MINOR 0
#define VERSION_REVISION 17
3
#define VERSION_REVISION 17
4
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
...
...
请
注册
或
登录
后发表评论