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-01-08 17:48:45 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
982e9555bda09fa8a7b39388206e1024abbe0c6f
982e9555
1 parent
b4667569
merge from feilong, fix hls msg memory leak bug.
隐藏空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
2 行增加
和
2 行删除
trunk/src/app/srs_app_source.cpp
trunk/src/app/srs_app_source.cpp
查看文件 @
982e955
...
...
@@ -1239,7 +1239,7 @@ int SrsSource::on_audio(SrsCommonMessage* __audio)
srs_verbose
(
"initialize shared ptr audio success."
);
#ifdef SRS_AUTO_HLS
if
((
ret
=
hls
->
on_audio
(
msg
.
copy
()
))
!=
ERROR_SUCCESS
)
{
if
((
ret
=
hls
->
on_audio
(
&
msg
))
!=
ERROR_SUCCESS
)
{
// apply the error strategy for hls.
// @see https://github.com/winlinvip/simple-rtmp-server/issues/264
std
::
string
hls_error_strategy
=
_srs_config
->
get_hls_on_error
(
_req
->
vhost
);
...
...
@@ -1366,7 +1366,7 @@ int SrsSource::on_video(SrsCommonMessage* __video)
srs_verbose
(
"initialize shared ptr video success."
);
#ifdef SRS_AUTO_HLS
if
((
ret
=
hls
->
on_video
(
msg
.
copy
()
))
!=
ERROR_SUCCESS
)
{
if
((
ret
=
hls
->
on_video
(
&
msg
))
!=
ERROR_SUCCESS
)
{
// apply the error strategy for hls.
// @see https://github.com/winlinvip/simple-rtmp-server/issues/264
std
::
string
hls_error_strategy
=
_srs_config
->
get_hls_on_error
(
_req
->
vhost
);
...
...
请
注册
或
登录
后发表评论