disabled windows build, updated to ffmpeg 4
This commit is contained in:
+3
-3
@@ -13,11 +13,11 @@ matrix:
|
||||
sudo: require
|
||||
dist: trusty
|
||||
- os: osx
|
||||
- os: windows
|
||||
env: ARCH=x86_64
|
||||
# Can't build on Windows - affected by https://travis-ci.community/t/current-known-issues-please-read-this-before-posting-a-new-topic/264/10
|
||||
# - os: windows
|
||||
|
||||
before_install:
|
||||
- if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install msys2 -y; else source ./.travis/before_install.sh; fi
|
||||
- source ./.travis/before_install.sh
|
||||
|
||||
install:
|
||||
- source ./.travis/install.sh
|
||||
|
||||
@@ -5,6 +5,7 @@ if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
||||
# install apt repos necessary for Olive
|
||||
sudo add-apt-repository ppa:beineri/opt-qt593-trusty -y
|
||||
sudo add-apt-repository ppa:jonathonf/ffmpeg-3 -y
|
||||
sudo add-apt-repository ppa:jonathonf/ffmpeg-4 -y
|
||||
sudo apt-get update -qq
|
||||
|
||||
elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
|
||||
|
||||
Reference in New Issue
Block a user