From 92ea56642e5b6cc7b20193a4a10e86423c50009f Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Mon, 11 Feb 2019 03:18:46 -0800
Subject: [PATCH] disabled windows build, updated to ffmpeg 4

---
 .travis.yml               | 6 +++---
 .travis/before_install.sh | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index be5d689cc..b718c49b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
diff --git a/.travis/before_install.sh b/.travis/before_install.sh
index 75b153289..d16ea4f65 100644
--- a/.travis/before_install.sh
+++ b/.travis/before_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