1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00

fix the build ffmpeg script bug, add yasm to path when build

This commit is contained in:
winlin 2013-12-06 10:46:32 +08:00
parent 86b1f3349a
commit 4827777035
2 changed files with 3 additions and 3 deletions

6
trunk/auto/build_ffmpeg.sh Executable file → Normal file
View file

@ -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

0
trunk/auto/depends.sh Executable file → Normal file
View file