mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Merge commit '899ee03088d55152a48830df0899887f055da1de'
* commit '899ee03088d55152a48830df0899887f055da1de': Unbreak travis on macos Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
commit
ecb5546e97
@ -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:
|
||||||
|
Loading…
Reference in New Issue
Block a user