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-12-06 10:46:32 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
4827777035d44786155785b17cca21e3cbe50618
48277770
1 parent
86b1f334
fix the build ffmpeg script bug, add yasm to path when build
显示空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
3 行增加
和
3 行删除
trunk/auto/build_ffmpeg.sh
trunk/auto/depends.sh
trunk/auto/build_ffmpeg.sh
100755 → 100644
查看文件 @
4827777
...
...
@@ -17,9 +17,6 @@ mkdir -p ${ff_release_dir}
ff_yasm_bin
=
${
ff_release_dir
}
/bin/yasm
if
[[
-f
${
ff_yasm_bin
}
]]
;
then
echo
"yasm is ok"
# add yasm to path, for x264 to use yasm directly.
# ffmpeg can specifies the yasm path when configure it.
PATH
=
${
PATH
}
:
${
ff_release_dir
}
/bin
else
echo
"build yasm-1.2.0"
cd
$ff_current_dir
&&
...
...
@@ -28,6 +25,9 @@ else
make
&&
make install
ret
=
$?
;
if
[[
0 -ne
${
ret
}
]]
;
then
echo
"build yasm-1.2.0 failed"
;
exit
1;
fi
fi
# add yasm to path, for x264 to use yasm directly.
# ffmpeg can specifies the yasm path when configure it.
PATH
=
${
PATH
}
:
${
ff_release_dir
}
/bin
# libaacplus
if
[[
-f
${
ff_release_dir
}
/lib/libaacplus.a
]]
;
then
...
...
trunk/auto/depends.sh
100755 → 100644
查看文件 @
4827777
请
注册
或
登录
后发表评论