]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '4809781586d1c956005f72946a2aab5915eab350'
authorJames Almer <jamrial@gmail.com>
Sat, 28 Oct 2017 18:08:31 +0000 (15:08 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 28 Oct 2017 18:08:31 +0000 (15:08 -0300)
* commit '4809781586d1c956005f72946a2aab5915eab350':
  travis: Exclude gcc for the macOS target

Merged-by: James Almer <jamrial@gmail.com>
1  2 
.travis.yml

diff --cc .travis.yml
index 40f01f94c2679cdb904e557f7b1ca79af05f44c9,5aa2802636f145ddcd5d2d6f83640a62c867340d..63f2051cb3f1f22e2529e61ad682c00b3a9a731a
@@@ -11,9 -11,13 +11,13 @@@ addons
  compiler:
    - clang
    - gcc
+ matrix:
+     exclude:
+         - os: osx
+           compiler: gcc
  cache:
    directories:
 -    - libav-samples
 +    - ffmpeg-samples
  before_install:
    - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update --all; fi
  install: