Merge commit 'eda183287489b2c705843aa373a19c4e46fb2fec'

* commit 'eda183287489b2c705843aa373a19c4e46fb2fec':
  travis: Enable OSX integration

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

.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