diff options
| author | James Almer <jamrial@gmail.com> | 2019-03-14 15:53:16 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2019-03-14 15:53:16 -0300 |
| commit | ecb5546e97c479378e057f527cc1d79a46c31cb1 (patch) | |
| tree | 79f74c80a921a37db0cf4214578f5d50ed4bbfbe | |
| parent | ac4b5d86222006fa71ffe5922e1a34f1422507d8 (diff) | |
| parent | 899ee03088d55152a48830df0899887f055da1de (diff) | |
| download | ffmpeg-ecb5546e97c479378e057f527cc1d79a46c31cb1.tar.gz | |
Merge commit '899ee03088d55152a48830df0899887f055da1de'
* commit '899ee03088d55152a48830df0899887f055da1de':
Unbreak travis on macos
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
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: |