diff options
| author | Alex Xu <alex_y_xu@yahoo.ca> | 2014-03-27 13:43:42 -0400 |
|---|---|---|
| committer | Alex Xu <alex_y_xu@yahoo.ca> | 2014-03-27 13:43:42 -0400 |
| commit | 65a027f72a1fa5704030e7ee9aef813d560860d6 (patch) | |
| tree | 672b51c7ed31e8ed9029d6c5d98c54739b65b532 | |
| parent | 74dfbc6783e19443d736f148ba0d5d0891b8a9b2 (diff) | |
| download | html5ks-65a027f72a1fa5704030e7ee9aef813d560860d6.tar.xz html5ks-65a027f72a1fa5704030e7ee9aef813d560860d6.zip | |
fix travis
| -rwxr-xr-x | .travis.sh | 3 | ||||
| -rw-r--r-- | .travis.yml | 2 |
2 files changed, 1 insertions, 4 deletions
@@ -74,9 +74,6 @@ case "$1" in cd .. rm -rf libvpx-v1.3.0 - cd apngasm-2.8 - - cd ffmpeg ./configure --disable-everything --disable-logging --disable-programs --disable-runtime-cpudetect --enable-decoder=mpeg4 --enable-decoder=pcm_s16le --enable-decoder=vorbis --enable-decoder=rawvideo --enable-demuxer=matroska --enable-demuxer=ogg --enable-demuxer=wav --enable-demuxer=yuv4mpegpipe --enable-encoder=libfdk_aac --enable-encoder=libopus --enable-encoder=libtheora --enable-encoder=libvpx_vp8 --enable-encoder=libvpx_vp9 --enable-encoder=libx264 --enable-encoder=pcm_s16le --enable-encoder=rawvideo --enable-ffmpeg --enable-filter=aresample --enable-gpl --enable-hardcoded-tables --enable-libfdk_aac --enable-libopus --enable-libtheora --enable-libvpx --enable-libx264 --enable-muxer=ipod --enable-muxer=mp4 --enable-muxer=ogg --enable-muxer=wav --enable-muxer=webm --enable-muxer=yuv4mpegpipe --enable-nonfree --enable-protocol=file make $MAKEOPTS >/dev/null diff --git a/.travis.yml b/.travis.yml index f04c491..c9b77ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: c python: '3.3' node_js: '0.11' env: MINIMAL=1 CFLAGS="-O2 -march=native -pipe" CXXFLAGS="-O2 -march=native -pipe" - MAKEOPTS="-j8" FFMPEG="ffmpeg -t 00:00:05" + MAKEOPTS="-j8" FFMPEGFLAGS="-t 00:00:05" before_install: ./.travis.sh before_install install: ./.travis.sh install script: ./.travis.sh script |