summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2015-11-17 13:23:08 +0100
committerVittorio Giovara <vittorio.giovara@gmail.com>2015-11-17 16:51:00 +0100
commiteda183287489b2c705843aa373a19c4e46fb2fec (patch)
tree72c7a126468ad5782e5fd93ed66ffa922598b9e7
parent79d89cf2f4b62eeb653fd8139041c87e75f7ca65 (diff)
downloadffmpeg-eda183287489b2c705843aa373a19c4e46fb2fec.tar.gz
travis: Enable OSX integration
-rw-r--r--.travis.yml7
1 files changed, 7 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 2e9d301641..8e9629a8dd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,8 @@
language: c
sudo: false
+os:
+ - linux
+ - osx
addons:
apt:
packages:
@@ -11,6 +14,10 @@ compiler:
cache:
directories:
- libav-samples
+before_install:
+ - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update --all; fi
+install:
+ - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install yasm; fi
script:
- mkdir -p libav-samples
- ./configure --samples=libav-samples --cc=$CC