From 39cbd53652c1418ee1d571754d44b38417824bd8 Mon Sep 17 00:00:00 2001
From: Noah Stier <noah.stier@gmail.com>
Date: Fri, 6 Oct 2017 00:06:02 -0700
Subject: [PATCH 1/4] Update ffmpeg build URL

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f1863cd..33fd71a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,8 @@ language: python
 before_install:
   - >
     [ -f ffmpeg-3.3.1-64bit-static/ffmpeg ] || (
-        curl -O https://johnvansickle.com/ffmpeg/releases/ffmpeg-3.3.1-64bit-static.tar.xz &&
-        tar Jxf ffmpeg-3.3.1-64bit-static.tar.xz
+        curl -O https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz &&
+        tar Jxf ffmpeg-release-64bit-static.tar.xz
     )
 matrix:
   include:

From c4eae56495cbc628d749e31ca5983b682717c591 Mon Sep 17 00:00:00 2001
From: Noah Stier <noah.stier@gmail.com>
Date: Fri, 6 Oct 2017 00:15:08 -0700
Subject: [PATCH 2/4] Update ffmpeg build URL in more places

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

diff --git a/.travis.yml b/.travis.yml
index 33fd71a..c87e64f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: python
 before_install:
   - >
-    [ -f ffmpeg-3.3.1-64bit-static/ffmpeg ] || (
+    [ -f ffmpeg-release-64bit-static/ffmpeg ] || (
         curl -O https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz &&
         tar Jxf ffmpeg-release-64bit-static.tar.xz
     )
@@ -28,9 +28,9 @@ matrix:
 install:
   - pip install tox
 script:
-  - export PATH=$(readlink -f ffmpeg-3.3.1-64bit-static):$PATH
+  - export PATH=$(readlink -f ffmpeg-release-64bit-static):$PATH
   - tox -e $TOX_ENV
 cache:
   directories:
     - .tox
-    - ffmpeg-3.3.1-64bit-static
+    - ffmpeg-release-64bit-static

From 38f2e703d2ce9953ca9d4c9c1fc49a858a4606e6 Mon Sep 17 00:00:00 2001
From: Noah Stier <noah.stier@gmail.com>
Date: Fri, 6 Oct 2017 00:19:14 -0700
Subject: [PATCH 3/4] update ffmpeg build dir name

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

diff --git a/.travis.yml b/.travis.yml
index c87e64f..65590ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: python
 before_install:
   - >
-    [ -f ffmpeg-release-64bit-static/ffmpeg ] || (
+    [ -f ffmpeg-3.3.4-64bit-static/ffmpeg ] || (
         curl -O https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz &&
         tar Jxf ffmpeg-release-64bit-static.tar.xz
     )
@@ -28,9 +28,9 @@ matrix:
 install:
   - pip install tox
 script:
-  - export PATH=$(readlink -f ffmpeg-release-64bit-static):$PATH
+  - export PATH=$(readlink -f ffmpeg-3.3.4-64bit-static):$PATH
   - tox -e $TOX_ENV
 cache:
   directories:
     - .tox
-    - ffmpeg-release-64bit-static
+    - ffmpeg-3.3.4-64bit-static

From 39741f49c3972eccf13023421d8eb85b54176132 Mon Sep 17 00:00:00 2001
From: Karl Kroening <karlk@kralnet.us>
Date: Wed, 1 Nov 2017 00:25:21 -0700
Subject: [PATCH 4/4] travis: use generic directory name for ffmpeg

---
 .travis.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 65590ea..fd23c17 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,10 @@
 language: python
 before_install:
   - >
-    [ -f ffmpeg-3.3.4-64bit-static/ffmpeg ] || (
+    [ -f ffmpeg-release/ffmpeg ] || (
         curl -O https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz &&
-        tar Jxf ffmpeg-release-64bit-static.tar.xz
+        mkdir -p ffmpeg-release &&
+        tar Jxf ffmpeg-release-64bit-static.tar.xz --strip-components=1 -C ffmpeg-release
     )
 matrix:
   include:
@@ -28,9 +29,9 @@ matrix:
 install:
   - pip install tox
 script:
-  - export PATH=$(readlink -f ffmpeg-3.3.4-64bit-static):$PATH
+  - export PATH=$(readlink -f ffmpeg-release):$PATH
   - tox -e $TOX_ENV
 cache:
   directories:
     - .tox
-    - ffmpeg-3.3.4-64bit-static
+    - ffmpeg-release