From ec15493c14591808eff4fde66dee91c331489e8f Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Sun, 16 Jun 2019 00:12:55 +0200
Subject: [PATCH 1/4] Update travis conf for xenial

---
 .travis.yml | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5e9a9df..e00b915 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,36 +1,31 @@
 language: python
 cache: pip
+dist: xenial
 
 matrix:
   include:
     - python: 3.5
       addons:
         apt:
-          sources:
-            - trusty-media
           packages:
             - ubuntu-restricted-extras
             - ffmpeg
-            - libavcodec-extra-54
       before_script:
         ffmpeg --help
     - python: 3.6
       addons:
         apt:
-          sources:
-            - trusty-media
           packages:
             - ubuntu-restricted-extras
             - ffmpeg
-            - libavcodec-extra-54
       before_script:
         ffmpeg --help
     - python: 3.7
-      dist: xenial
-      before_install:
-        - sudo add-apt-repository ppa:mc3man/xerus-media -y
-        - sudo apt-get update -qq
-        - sudo apt-get install -qq ubuntu-restricted-extras ffmpeg
+      addons:
+        apt:
+          packages:
+            - ubuntu-restricted-extras
+            - ffmpeg
       before_script:
         ffmpeg --help
     - python: 3.6

From 05f1733c463e388a9b7638234ae6b0da55f4738c Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Sun, 16 Jun 2019 00:19:45 +0200
Subject: [PATCH 2/4] Add libavcodec-extra

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

diff --git a/.travis.yml b/.travis.yml
index e00b915..2c6bc34 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,7 @@ matrix:
           packages:
             - ubuntu-restricted-extras
             - ffmpeg
+            - libavcodec-extra
       before_script:
         ffmpeg --help
     - python: 3.6
@@ -18,6 +19,7 @@ matrix:
           packages:
             - ubuntu-restricted-extras
             - ffmpeg
+            - libavcodec-extra
       before_script:
         ffmpeg --help
     - python: 3.7
@@ -26,6 +28,7 @@ matrix:
           packages:
             - ubuntu-restricted-extras
             - ffmpeg
+            - libavcodec-extra
       before_script:
         ffmpeg --help
     - python: 3.6

From 1fbb3842586b8e51c2c6af8e22fe24c17917dfb5 Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Sun, 16 Jun 2019 00:23:26 +0200
Subject: [PATCH 3/4] Use ppa

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

diff --git a/.travis.yml b/.travis.yml
index 2c6bc34..d846a84 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,8 @@ matrix:
     - python: 3.5
       addons:
         apt:
+          sources:
+            - ppa:mc3man/xerus-media
           packages:
             - ubuntu-restricted-extras
             - ffmpeg
@@ -16,6 +18,8 @@ matrix:
     - python: 3.6
       addons:
         apt:
+          sources:
+            - ppa:mc3man/xerus-media
           packages:
             - ubuntu-restricted-extras
             - ffmpeg
@@ -25,6 +29,8 @@ matrix:
     - python: 3.7
       addons:
         apt:
+          sources:
+            - ppa:mc3man/xerus-media
           packages:
             - ubuntu-restricted-extras
             - ffmpeg

From 46f4389f91213e8a0a55d7485918a04cbf1210ce Mon Sep 17 00:00:00 2001
From: Simon Conseil <contact@saimon.org>
Date: Sun, 16 Jun 2019 00:26:57 +0200
Subject: [PATCH 4/4] Use manual install

---
 .travis.yml | 36 ++++++++++++------------------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d846a84..8ec86c4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,36 +5,24 @@ dist: xenial
 matrix:
   include:
     - python: 3.5
-      addons:
-        apt:
-          sources:
-            - ppa:mc3man/xerus-media
-          packages:
-            - ubuntu-restricted-extras
-            - ffmpeg
-            - libavcodec-extra
+      before_install:
+        - sudo add-apt-repository ppa:mc3man/xerus-media -y
+        - sudo apt-get update -qq
+        - sudo apt-get install -qq ubuntu-restricted-extras ffmpeg
       before_script:
         ffmpeg --help
     - python: 3.6
-      addons:
-        apt:
-          sources:
-            - ppa:mc3man/xerus-media
-          packages:
-            - ubuntu-restricted-extras
-            - ffmpeg
-            - libavcodec-extra
+      before_install:
+        - sudo add-apt-repository ppa:mc3man/xerus-media -y
+        - sudo apt-get update -qq
+        - sudo apt-get install -qq ubuntu-restricted-extras ffmpeg
       before_script:
         ffmpeg --help
     - python: 3.7
-      addons:
-        apt:
-          sources:
-            - ppa:mc3man/xerus-media
-          packages:
-            - ubuntu-restricted-extras
-            - ffmpeg
-            - libavcodec-extra
+      before_install:
+        - sudo add-apt-repository ppa:mc3man/xerus-media -y
+        - sudo apt-get update -qq
+        - sudo apt-get install -qq ubuntu-restricted-extras ffmpeg
       before_script:
         ffmpeg --help
     - python: 3.6