From 999e2876b4620983d8f06cdf8e98b74a13c9ea70 Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 6 May 2014 14:09:51 +0800 Subject: [PATCH] revert to try to merge with pull request --- trunk/auto/build_ffmpeg.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/trunk/auto/build_ffmpeg.sh b/trunk/auto/build_ffmpeg.sh index ef626483d..1eeb0d575 100755 --- a/trunk/auto/build_ffmpeg.sh +++ b/trunk/auto/build_ffmpeg.sh @@ -77,9 +77,7 @@ else cd $ff_current_dir && rm -rf x264-snapshot-20131129-2245-stable && unzip -q ${ff_src_dir}/x264-snapshot-20131129-2245-stable.zip && cd x264-snapshot-20131129-2245-stable && - ./configure --prefix=${ff_release_dir} --disable-opencl --bit-depth=8 --enable-static \ - --disable-avs --disable-swscale --disable-lavf \ - --disable-ffms --disable-gpac && + ./configure --prefix=${ff_release_dir} --disable-opencl --bit-depth=8 --enable-static && make ${SRS_JOBS} && make install ret=$?; if [[ 0 -ne ${ret} ]]; then echo "build x264 failed"; exit 1; fi fi