Merge branch 'develop' into libav-compat

ferdnyc · ferdnyc · commit cfb1fc9c504e · 2019-12-15T14:29:57.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -32,6 +32,11 @@ addons:
     - libswresample-dev
 
 matrix:
+
+  # The FFmpeg4 PPA is currently down as a protest
+  allow_failures:
+  - env: BUILD_VERSION=ffmpeg4
+
   include:
     - name: "FFmpeg 2 GCC (Ubuntu 16.04 Xenial)"
       env: BUILD_VERSION=ffmpeg2
