RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '899ee03088d55152a48830df0899887f055da1de' 

* commit '899ee03088d55152a48830df0899887f055da1de':
  Unbreak travis on macos

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2019-03-14 15:53:16 -03:00
parent ac4b5d8622 899ee03088
commit ecb5546e97
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -19,7 +19,7 @@ cache:
directories: directories:
- ffmpeg-samples - ffmpeg-samples
before_install: before_install:
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update --all; fi - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi
install: install:
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install nasm; fi - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install nasm; fi
script: script: