summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-03-24 00:12:48 +0100
committerwm4 <wm4@nowhere>2014-03-24 00:12:48 +0100
commitf4fe22266d97b01833f1df6048c484ff066726a2 (patch)
treeaa0f1de68732d0a52f84b165e792e4b912197c9a
parentbb1b0a9f42dabbaa196266fc11fddede74845877 (diff)
downloadmpv-f4fe22266d97b01833f1df6048c484ff066726a2.tar.bz2
mpv-f4fe22266d97b01833f1df6048c484ff066726a2.tar.xz
travis-ci: update Libav release
Libav 10 was released, so we can enable testing the stable Libav version again. FFmpeg 2.2 was also released, but since we still support 2.1.4, we stick with the older version. This is better for testing.
-rw-r--r--.travis.yml1
-rwxr-xr-xtravis-deps2
2 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index a1650a0cee..faafe27b86 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
language: c
env:
+ - LIBAV=libav-stable
- LIBAV=libav-git
- LIBAV=ffmpeg-stable
- LIBAV=ffmpeg-git
diff --git a/travis-deps b/travis-deps
index fe0d80eea6..f43a78d55e 100755
--- a/travis-deps
+++ b/travis-deps
@@ -54,7 +54,7 @@ class Libav < TravisDepsBuilder
{
"libav-stable" => {
:action => :stable,
- :url => 'http://libav.org/releases/libav-9.10.tar.gz'
+ :url => 'http://libav.org/releases/libav-10.tar.gz'
},
"libav-git" => {
:action => :git,