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-02-28 21:07:46 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
bcb719bf18211c72f5997b54f6c4d6f70cff1e68
bcb719bf
1 parent
98503486
create log dir
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
9 行增加
和
2 行删除
trunk/conf/srs.conf
trunk/configure
trunk/conf/srs.conf
查看文件 @
bcb719b
...
...
@@ -238,7 +238,7 @@ vhost crop.transcode.vhost.com {
}
}
}
# the logo filter of ffmpeg, @see: http://ffmpeg.org/ffmpeg-filters.html#
crop
# the logo filter of ffmpeg, @see: http://ffmpeg.org/ffmpeg-filters.html#
overlay
vhost
logo
.
transcode
.
vhost
.
com
{
transcode
{
enabled
on
;
...
...
@@ -246,7 +246,8 @@ vhost logo.transcode.vhost.com {
engine
logo
{
enabled
on
;
vfilter
{
vf
'crop=200:100:10:10'
;
i
./
doc
/
ffmpeg
-
logo
.
png
;
filter_complex
'overlay=10:10'
;
}
vcodec
libx264
;
vbitrate
300
;
...
...
trunk/configure
查看文件 @
bcb719b
...
...
@@ -163,6 +163,12 @@ BUILD_KEY="bandwidth" APP_MAIN="srs_main_bandcheck" APP_NAME="bandwidth" SO_PATH
echo
'configure ok! '
#####################################################################################
# when configure success, prepare build
#####################################################################################
# create objs/logs for ffmpeg to write log.
mkdir -p
${
SRS_OBJS
}
/logs
#####################################################################################
# configure summary
#####################################################################################
# linux shell color support.
...
...
请
注册
或
登录
后发表评论