正在显示
2 个修改的文件
包含
3 行增加
和
3 行删除
trunk/auto/build_ffmpeg.sh
100755 → 100644
| @@ -17,9 +17,6 @@ mkdir -p ${ff_release_dir} | @@ -17,9 +17,6 @@ mkdir -p ${ff_release_dir} | ||
| 17 | ff_yasm_bin=${ff_release_dir}/bin/yasm | 17 | ff_yasm_bin=${ff_release_dir}/bin/yasm |
| 18 | if [[ -f ${ff_yasm_bin} ]]; then | 18 | if [[ -f ${ff_yasm_bin} ]]; then |
| 19 | echo "yasm is ok" | 19 | echo "yasm is ok" |
| 20 | - # add yasm to path, for x264 to use yasm directly. | ||
| 21 | - # ffmpeg can specifies the yasm path when configure it. | ||
| 22 | - PATH=${PATH}:${ff_release_dir}/bin | ||
| 23 | else | 20 | else |
| 24 | echo "build yasm-1.2.0" | 21 | echo "build yasm-1.2.0" |
| 25 | cd $ff_current_dir && | 22 | cd $ff_current_dir && |
| @@ -28,6 +25,9 @@ else | @@ -28,6 +25,9 @@ else | ||
| 28 | make && make install | 25 | make && make install |
| 29 | ret=$?; if [[ 0 -ne ${ret} ]]; then echo "build yasm-1.2.0 failed"; exit 1; fi | 26 | ret=$?; if [[ 0 -ne ${ret} ]]; then echo "build yasm-1.2.0 failed"; exit 1; fi |
| 30 | fi | 27 | fi |
| 28 | +# add yasm to path, for x264 to use yasm directly. | ||
| 29 | +# ffmpeg can specifies the yasm path when configure it. | ||
| 30 | +PATH=${PATH}:${ff_release_dir}/bin | ||
| 31 | 31 | ||
| 32 | # libaacplus | 32 | # libaacplus |
| 33 | if [[ -f ${ff_release_dir}/lib/libaacplus.a ]]; then | 33 | if [[ -f ${ff_release_dir}/lib/libaacplus.a ]]; then |
trunk/auto/depends.sh
100755 → 100644
-
请 注册 或 登录 后发表评论