[FFmpeg-cvslog] Merge commit '4809781586d1c956005f72946a2aab5915eab350'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Oct 28 15:08:31 2017 -0300| [16a17fb6b2592caea6f0e7b79d09fd7d1f33177d] | committer: James Almer

Merge commit '4809781586d1c956005f72946a2aab5915eab350'

* commit '4809781586d1c956005f72946a2aab5915eab350':
  travis: Exclude gcc for the macOS target

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=16a17fb6b2592caea6f0e7b79d09fd7d1f33177d
---

 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

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


======================================================================

diff --cc .travis.yml
index 40f01f94c2,5aa2802636..63f2051cb3
--- a/.travis.yml
+++ b/.travis.yml
@@@ -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: