winlin

Merge pull request #56 from T-bagwell/master

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