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
2013-11-30 16:45:47 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
b1466c88834c51d1ed982cb3af40e0aee7fb84ae
b1466c88
1 parent
129244aa
fix build ffmpeg bug, add -ldl compile option
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
24 行增加
和
13 行删除
trunk/auto/build_ffmpeg.sh
trunk/conf/srs.conf
trunk/auto/build_ffmpeg.sh
100644 → 100755
查看文件 @
b1466c8
...
...
@@ -81,7 +81,7 @@ else
--prefix
=
${
ff_release_dir
}
--cc
=
\
--enable-static --disable-shared --disable-debug
\
--extra-cflags
=
'-I${ffmpeg_exported_release_dir}/include'
\
--extra-ldflags
=
'-L${ffmpeg_exported_release_dir}/lib -lm'
\
--extra-ldflags
=
'-L${ffmpeg_exported_release_dir}/lib -lm
-ldl
'
\
--disable-ffplay --disable-ffprobe --disable-ffserver --disable-doc
\
--enable-postproc --enable-bzlib --enable-zlib --enable-parsers
\
--enable-libx264 --enable-libmp3lame --enable-libaacplus
\
...
...
trunk/conf/srs.conf
查看文件 @
b1466c8
...
...
@@ -17,7 +17,8 @@ vhost __defaultVhost__ {
hls_window
30
;
#forward 127.0.0.1:1936;
transcode
{
ffmpeg
./
objs
/
ffmpeg
/
bin
/
ffmpeg
;
enabled
on
;
ffmpeg
./
objs
/
ffmpeg
/
bin
/
ffmpeg
;
engine
fd
{
vcodec
libx264
;
vbitrate
300
;
...
...
@@ -33,13 +34,17 @@ vhost __defaultVhost__ {
asample_rate
22050
;
achannels
2
;
aparams
{}
output
rtmp
://[
vhost
]:[
port
]/[
app
]/[
stream
]
_
fast
;
output
rtmp
://[
vhost
]:[
port
]/[
app
]/[
stream
]
_
fast
;
}
}
}
# transcode all app and stream of vhost
vhost
all
.
transcode
.
vhost
.
com
{
# the streaming transcode configs.
transcode
{
# whether the transcode enabled.
# if off, donot transcode.
enabled
on
;
# the ffmpeg
ffmpeg
./
objs
/
ffmpeg
/
bin
/
ffmpeg
;
# all matched stream will transcoded to the following stream.
...
...
@@ -84,7 +89,7 @@ vhost all.transcode.vhost.com {
# [port] the intput stream port.
# [app] the input stream app.
# [stream] the input stream name.
output
rtmp
://[
vhost
]:[
port
]/[
app
]/[
stream
]
_
super
;
output
rtmp
://[
vhost
]:[
port
]/[
app
]/[
stream
]
_
super
;
}
engine
hd
{
vcodec
libx264
;
...
...
@@ -95,13 +100,15 @@ vhost all.transcode.vhost.com {
vthreads
6
;
vprofile
main
;
vpreset
medium
;
vparams
{}
vparams
{
}
acodec
libaacplus
;
abitrate
70
;
asample_rate
44100
;
achannels
2
;
aparams
{}
output
rtmp
://[
vhost
]:[
port
]/[
app
]/[
stream
]
_
hd
;
aparams
{
}
output
rtmp
://[
vhost
]:[
port
]/[
app
]/[
stream
]
_
hd
;
}
engine
sd
{
vcodec
libx264
;
...
...
@@ -112,13 +119,15 @@ vhost all.transcode.vhost.com {
vthreads
4
;
vprofile
main
;
vpreset
fast
;
vparams
{}
vparams
{
}
acodec
libaacplus
;
abitrate
60
;
asample_rate
44100
;
achannels
2
;
aparams
{}
output
rtmp
://[
vhost
]:[
port
]/[
app
]/[
stream
]
_
sd
;
aparams
{
}
output
rtmp
://[
vhost
]:[
port
]/[
app
]/[
stream
]
_
sd
;
}
engine
fast
{
vcodec
libx264
;
...
...
@@ -129,13 +138,15 @@ vhost all.transcode.vhost.com {
vthreads
2
;
vprofile
baseline
;
vpreset
superfast
;
vparams
{}
vparams
{
}
acodec
libaacplus
;
abitrate
30
;
asample_rate
22050
;
achannels
2
;
aparams
{}
output
rtmp
://[
vhost
]:[
port
]/[
app
]/[
stream
]
_
fast
;
aparams
{
}
output
rtmp
://[
vhost
]:[
port
]/[
app
]/[
stream
]
_
fast
;
}
}
}
...
...
请
注册
或
登录
后发表评论