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
8 years ago
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
7fe60b5bbf3315eeec0aff774f3b4a55c089b3f2
7fe60b5b
1 parent
7bbb3bae
fix #735 config transform refer_publish invalid. 3.0.14
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
5 行增加
和
3 行删除
README.md
trunk/src/app/srs_app_config.cpp
trunk/src/core/srs_core.hpp
README.md
查看文件 @
7fe60b5
...
...
@@ -184,6 +184,7 @@ Please select your language:
### V3 changes
*
v3.0, 2017-01-11, fix
[
#735
][
bug #735
]
config transform refer_publish invalid. 3.0.14
*
v3.0, 2017-01-06, for
[
#730
][
bug #730
]
support config in/out ack size. 3.0.13
*
v3.0, 2017-01-06, for
[
#711
][
bug #711
]
support perfile for transcode. 3.0.12
*
v3.0, 2017-01-05, patch ST for valgrind and ARM. 3.0.11
...
...
@@ -1367,6 +1368,7 @@ Winlin
[
bug #513
]:
https://github.com/ossrs/srs/issues/513
[
bug #730
]:
https://github.com/ossrs/srs/issues/730
[
bug #635
]:
https://github.com/ossrs/srs/issues/635
[
bug #735
]:
https://github.com/ossrs/srs/issues/735
[
bug #xxxxxxxxxx
]:
https://github.com/ossrs/srs/issues/xxxxxxxxxx
[
exo #828
]:
https://github.com/google/ExoPlayer/pull/828
...
...
trunk/src/app/srs_app_config.cpp
查看文件 @
7fe60b5
...
...
@@ -391,10 +391,10 @@ int srs_config_transform_vhost(SrsConfDirective* root)
if
(
n
==
"refer"
)
{
SrsConfDirective
*
all
=
refer
->
get_or_create
(
"all"
);
all
->
args
=
conf
->
args
;
}
else
if
(
n
==
"play"
)
{
}
else
if
(
n
==
"
refer_
play"
)
{
SrsConfDirective
*
play
=
refer
->
get_or_create
(
"play"
);
play
->
args
=
conf
->
args
;
}
else
if
(
n
==
"publish"
)
{
}
else
if
(
n
==
"
refer_
publish"
)
{
SrsConfDirective
*
publish
=
refer
->
get_or_create
(
"publish"
);
publish
->
args
=
conf
->
args
;
}
...
...
trunk/src/core/srs_core.hpp
查看文件 @
7fe60b5
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR 3
#define VERSION_MINOR 0
#define VERSION_REVISION 1
3
#define VERSION_REVISION 1
4
// generated by configure, only macros.
#include <srs_auto_headers.hpp>
...
...
请
注册
或
登录
后发表评论