Merge commit 'eda183287489b2c705843aa373a19c4e46fb2fec'

* commit 'eda183287489b2c705843aa373a19c4e46fb2fec': travis: Enable OSX integration Merged-by: Derek Buitenhuis <[email protected]>
zhangxiaoben · Nov 22, 2015 · df8e24b · df8e24b
2 parents 5ebaf1e + eda1832
commit df8e24b
Showing 1 changed file with 7 additions and 0 deletions.
diff --git 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