diff options
| author | Diego Biurrun <diego@biurrun.de> | 2016-10-13 18:33:15 +0000 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-06-21 17:00:30 -0300 |
| commit | 4f9297ac3b39098547863d28fbc8d2a906d5be49 (patch) | |
| tree | 4672f09581a1a0e60b774e24f1f61457f5e69b0c /.travis.yml | |
| parent | 3cc73d3d6d2a98cd0da3deda90760729c82cdeeb (diff) | |
| download | ffmpeg-4f9297ac3b39098547863d28fbc8d2a906d5be49.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.
(Cherry-picked from libav commit 57b753b445e23363c997a8ec1c556e0b0f6e9da3)
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index e541ee1608..40f01f94c2 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 ffmpeg-samples - ./configure --samples=ffmpeg-samples --cc=$CC |