git.videolan.org
/
ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
avcodec/amrwbdec: Fix division by 0 in voice_factor()
[ffmpeg.git]
/
.travis.yml
diff --git
a/.travis.yml
b/.travis.yml
index
5f3c533
..
63f2051
100644
(file)
--- a/
.travis.yml
+++ b/
.travis.yml
@@
-1,16
+1,27
@@
language: c
sudo: false
language: c
sudo: false
+os:
+ - linux
+ - osx
addons:
apt:
packages:
addons:
apt:
packages:
- -
y
asm
+ -
n
asm
- diffutils
compiler:
- clang
- gcc
- diffutils
compiler:
- clang
- gcc
+matrix:
+ exclude:
+ - os: osx
+ compiler: gcc
cache:
directories:
- ffmpeg-samples
cache:
directories:
- ffmpeg-samples
+before_install:
+ - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update --all; fi
+install:
+ - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install nasm; fi
script:
- mkdir -p ffmpeg-samples
- ./configure --samples=ffmpeg-samples --cc=$CC
script:
- mkdir -p ffmpeg-samples
- ./configure --samples=ffmpeg-samples --cc=$CC