R3944Realms/srs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert to try to merge with pull request

Browse Source
This commit is contained in:
winlin 2014-05-06 14:09:51 +08:00
parent ae372de65e
commit 999e2876b4
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
trunk/auto/build_ffmpeg.sh
View File

@ -77,9 +77,7 @@ else
cd $ff_current_dir && cd $ff_current_dir &&
rm -rf x264-snapshot-20131129-2245-stable && unzip -q ${ff_src_dir}/x264-snapshot-20131129-2245-stable.zip && rm -rf x264-snapshot-20131129-2245-stable && unzip -q ${ff_src_dir}/x264-snapshot-20131129-2245-stable.zip &&
cd x264-snapshot-20131129-2245-stable && cd x264-snapshot-20131129-2245-stable &&
./configure --prefix=${ff_release_dir} --disable-opencl --bit-depth=8 --enable-static \ ./configure --prefix=${ff_release_dir} --disable-opencl --bit-depth=8 --enable-static &&
--disable-avs --disable-swscale --disable-lavf \
--disable-ffms --disable-gpac &&
make ${SRS_JOBS} && make install make ${SRS_JOBS} && make install
ret=$?; if [[ 0 -ne ${ret} ]]; then echo "build x264 failed"; exit 1; fi ret=$?; if [[ 0 -ne ${ret} ]]; then echo "build x264 failed"; exit 1; fi
fi fi