summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2016-10-13 20:33:15 +0200
committerDiego Biurrun <diego@biurrun.de>2017-03-07 08:32:37 +0100
commit57b753b445e23363c997a8ec1c556e0b0f6e9da3 (patch)
treea3c52e61aa087d38de4346368859424ffd67af74 /.travis.yml
parentf54037da8af2f2aeb5e5633b48434211e6a97fe5 (diff)
downloadffmpeg-57b753b445e23363c997a8ec1c556e0b0f6e9da3.tar.gz
build: Prefer NASM assembler over YASM
NASM is more actively maintained and permits generating dependency information as a sideeffect of assembling, thus cutting build times in half.
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 8e9629a8dd..6f9647a701 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ os:
addons:
apt:
packages:
- - yasm
+ - nasm
- diffutils
compiler:
- clang
@@ -17,7 +17,7 @@ cache:
before_install:
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update --all; fi
install:
- - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install yasm; fi
+ - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install nasm; fi
script:
- mkdir -p libav-samples
- ./configure --samples=libav-samples --cc=$CC