diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-11-22 17:12:24 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-11-22 17:12:24 +0000 |
| commit | df8e24be5da2f9a8b0bd86dbbd1b0bf508bac003 (patch) | |
| tree | 367ffc7df37dba1a01b5f15f625a7e14192571b4 | |
| parent | 5ebaf1e1cbee6097264b594dc66177cc1b6daaf2 (diff) | |
| parent | eda183287489b2c705843aa373a19c4e46fb2fec (diff) | |
| download | ffmpeg-df8e24be5da2f9a8b0bd86dbbd1b0bf508bac003.tar.gz | |
Merge commit 'eda183287489b2c705843aa373a19c4e46fb2fec'
* commit 'eda183287489b2c705843aa373a19c4e46fb2fec':
travis: Enable OSX integration
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| -rw-r--r-- | .travis.yml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 5f3c533027..e541ee1608 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: - ffmpeg-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 ffmpeg-samples - ./configure --samples=ffmpeg-samples --cc=$CC |