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-07 17:01:48 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
667191913b99b7f4e6cd2f205291509c31851a65
66719191
1 parent
5c994198
fix bug of package for arm
显示空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
7 行增加
和
3 行删除
trunk/auto/depends.sh
trunk/auto/options.sh
trunk/auto/depends.sh
查看文件 @
6671919
...
...
@@ -504,6 +504,8 @@ if [ $SRS_FFMPEG = YES ]; then
if
[
! -f
${
SRS_OBJS
}
/ffmpeg/bin/ffmpeg
]
;
then
echo
"build ffmpeg-2.1 failed."
;
exit
-1;
fi
fi
# whatever the FFMPEG tools, if transcode and ingest specified,
# srs always compile the FFMPEG tool stub which used to start the FFMPEG process.
__SRS_FFMPEG
=
NO
if
[
$SRS_TRANSCODE
=
YES
]
;
then
__SRS_FFMPEG
=
YES;
fi
if
[
$SRS_INGEST
=
YES
]
;
then
__SRS_FFMPEG
=
YES;
fi
...
...
trunk/auto/options.sh
查看文件 @
6671919
...
...
@@ -199,6 +199,7 @@ if [ $SRS_DEV = YES ]; then
SRS_FFMPEG
=
YES
SRS_TRANSCODE
=
YES
SRS_INGEST
=
YES
SRS_HTTP_PARSER
=
YES
SRS_HTTP_CALLBACK
=
YES
SRS_HTTP_SERVER
=
YES
SRS_HTTP_API
=
YES
...
...
@@ -222,9 +223,10 @@ if [ $SRS_PI = YES ]; then
SRS_NGINX
=
NO
SRS_SSL
=
YES
if
[
$SRS_FFMPEG
=
RESERVED
]
;
then
SRS_FFMPEG
=
NO;
fi
if
[
$SRS_TRANSCODE
=
RESERVED
]
;
then
SRS_TRANSCODE
=
NO;
fi
if
[
$SRS_INGEST
=
RESERVED
]
;
then
SRS_INGEST
=
NO;
fi
SRS_HTTP_CALLBACK
=
NO
if
[
$SRS_TRANSCODE
=
RESERVED
]
;
then
SRS_TRANSCODE
=
YES;
fi
if
[
$SRS_INGEST
=
RESERVED
]
;
then
SRS_INGEST
=
YES;
fi
SRS_HTTP_PARSER
=
YES
SRS_HTTP_CALLBACK
=
YES
SRS_HTTP_SERVER
=
YES
SRS_HTTP_API
=
YES
SRS_LIBRTMP
=
NO
...
...
请
注册
或
登录
后发表评论