[FFmpeg-cvslog] Merge commit '899ee03088d55152a48830df0899887f055da1de'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Mar 14 15:53:16 2019 -0300| [ecb5546e97c479378e057f527cc1d79a46c31cb1] | committer: James Almer

Merge commit '899ee03088d55152a48830df0899887f055da1de'

* commit '899ee03088d55152a48830df0899887f055da1de':
  Unbreak travis on macos

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

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

 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 63f2051cb3..784b7bdf73 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ cache:
   directories:
     - ffmpeg-samples
 before_install:
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update --all; fi
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi
 install:
   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install nasm; fi
 script:


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

diff --cc .travis.yml
index 63f2051cb3,3cfcb40c3a..784b7bdf73
--- a/.travis.yml
+++ b/.travis.yml
@@@ -17,9 -17,9 +17,9 @@@ matrix
            compiler: gcc
  cache:
    directories:
 -    - libav-samples
 +    - ffmpeg-samples
  before_install:
-   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update --all; fi
+   - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi
  install:
    - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install nasm; fi
  script: