Merge commit '84adab333cddeefc3cfd843089dee23f58bd372c'

[ffmpeg] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 5f3c533027f195f3095ca2f0e739106c1d09343c..e541ee1608848a05dcfe1f32dc144053a19bb01f 100644 (file)
--- 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