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-04-10 17:19:49 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
3a26b23fbafae9071bbd9f291183f8f5b3c1f0cf
3a26b23f
1 parent
ca02cfe1
change ffmpeg log to ./objs
显示空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
4 行增加
和
4 行删除
trunk/conf/full.conf
trunk/research/api-server/server.py
trunk/src/app/srs_app_config.cpp
trunk/conf/full.conf
查看文件 @
3a26b23
...
...
@@ -19,8 +19,8 @@ pid ./objs/srs.pid;
chunk_size
60000
;
# the logs dir.
# if enabled ffmpeg, each stracoding stream will create a log file.
# default: ./objs/logs
ff_log_dir
./
objs
/
logs
;
# default: ./objs
ff_log_dir
./
objs
;
# the log tank, console or file.
# if console, print log to console.
# if file, write log to file. requires srs_log_file if log to file.
...
...
trunk/research/api-server/server.py
查看文件 @
3a26b23
...
...
@@ -336,7 +336,7 @@ class RESTServers(object):
'''
def
GET
(
self
,
id
=
None
):
enable_crossdomain
()
if
id
==
"meeting"
if
id
==
"meeting"
:
url
=
"http://
%
s:8085/players/srs_chat.html?port=1935"
%
(
self
.
__server_ip
)
else
:
url
=
"http://
%
s:8080/live/livestream.html"
%
(
self
.
__server_ip
)
...
...
trunk/src/app/srs_app_config.cpp
查看文件 @
3a26b23
...
...
@@ -1933,7 +1933,7 @@ string SrsConfig::get_ffmpeg_log_dir()
SrsConfDirective
*
conf
=
root
->
get
(
"ff_log_dir"
);
if
(
!
conf
||
conf
->
arg0
().
empty
())
{
return
"./objs
/logs
"
;
return
"./objs"
;
}
return
conf
->
arg0
();
...
...
请
注册
或
登录
后发表评论