From a4e0867d6d9d2a0d1c6b49be36e092f6f62a67e6 Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dominik.ritter@chefkoch.de>
Date: Sat, 18 Apr 2020 18:43:05 +0200
Subject: [PATCH 1/3] Remove libvpx1 from build

This library was disallowed by travis (or ubuntu xenial) itself in the old builds.
---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4deadec6e..78fb37086 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,6 @@ addons:
     - libpng-dev
     - libx264-dev
     - libass-dev
-    - libvpx1
     - libvpx-dev
     - libwebp-dev
     - webp

From b04193e556b83c5ce67471c6bc14126fcc7eec15 Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dominik.ritter@chefkoch.de>
Date: Sat, 18 Apr 2020 19:05:14 +0200
Subject: [PATCH 2/3] Fix path to static FFmpeg

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 78fb37086..d380b322b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,7 +36,7 @@ addons:
     - python-scipy
     - cython
 install:
-  - wget http://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz
+  - wget https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz
     -O /tmp/ffmpeg-release.tar.xz
   - mkdir /tmp/ffmpeg-release
   - tar -C /tmp/ffmpeg-release --strip 1 -xvf /tmp/ffmpeg-release.tar.xz

From dd1adc901ef83bd575ad3323ace534534d6b360a Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dominik.ritter@chefkoch.de>
Date: Sun, 19 Apr 2020 00:20:56 +0200
Subject: [PATCH 3/3] Install ffmpeg via apt

---
 .travis.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d380b322b..f13f1b51d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,8 @@ env:
   - UNIT_TEST=1
 addons:
   apt:
+    sources:
+    - trusty-media
     packages:
     - libcurl4-openssl-dev
     - python-numpy
@@ -35,13 +37,8 @@ addons:
     - python-numpy
     - python-scipy
     - cython
+    - ffmpeg
 install:
-  - wget https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz
-    -O /tmp/ffmpeg-release.tar.xz
-  - mkdir /tmp/ffmpeg-release
-  - tar -C /tmp/ffmpeg-release --strip 1 -xvf /tmp/ffmpeg-release.tar.xz
-  - export PATH=/tmp/ffmpeg-release:$PATH
-  - ffmpeg -version
   - pip install --upgrade pip
   - make setup
   - pip install coveralls