aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-10-28 15:08:31 -0300
committerJames Almer <jamrial@gmail.com>2017-10-28 15:08:31 -0300
commit16a17fb6b2592caea6f0e7b79d09fd7d1f33177d (patch)
tree0996aef37bec484148efca882db389a5464fea3f
parent7d829da3f91984240bae05325f1f7538d31f605b (diff)
parent4809781586d1c956005f72946a2aab5915eab350 (diff)
downloadffmpeg-16a17fb6b2592caea6f0e7b79d09fd7d1f33177d.tar.gz
Merge commit '4809781586d1c956005f72946a2aab5915eab350'
* commit '4809781586d1c956005f72946a2aab5915eab350': travis: Exclude gcc for the macOS target Merged-by: James Almer <jamrial@gmail.com>
-rw-r--r--.travis.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 40f01f94c2..63f2051cb3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,10 @@ addons:
compiler:
- clang
- gcc
+matrix:
+ exclude:
+ - os: osx
+ compiler: gcc
cache:
directories:
- ffmpeg-samples