Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '899ee03088d55152a48830df0899887f055da1de'

Browse Source 
* commit '899ee03088d55152a48830df0899887f055da1de':
  Unbreak travis on macos

Merged-by: James Almer <jamrial@gmail.com>
pull/310/head
James Almer 6 years ago
parent ac4b5d8622 899ee03088
commit ecb5546e97
1 changed files with 1 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      .travis.yml

2
.travis.yml
Unescape 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:

Write Preview
Loading…
Cancel
Save