summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Constantino <wiiaboo@gmail.com>2017-12-22 18:23:14 +0000
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2017-12-22 21:21:05 +0100
commit6426b2e1ac94d74703c57357c30f5d90d612c565 (patch)
tree025b8e9e66071322d44c1cce02e8ed623aedb4ef
parent29647880551c7b15944d6299a2cd5d502a4efb88 (diff)
downloadmpv-fix-travis.tar.bz2
mpv-fix-travis.tar.xz
travis: stop excluding ffmpeg-gitfix-travis
Signed-off-by: Stefano Pigozzi <stefano.pigozzi@gmail.com>
-rw-r--r--.travis.yml2
-rwxr-xr-xTOOLS/travis-deps2
2 files changed, 1 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 73c2534d28..162941ecbf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,8 +31,6 @@ matrix:
- os: osx
compiler: gcc
- os: linux
- env: LIBAV=ffmpeg-git
- - os: linux
compiler: clang
before_install: TOOLS/travis-deps libass-stable $LIBAV
diff --git a/TOOLS/travis-deps b/TOOLS/travis-deps
index 0126ce3389..aba68dad61 100755
--- a/TOOLS/travis-deps
+++ b/TOOLS/travis-deps
@@ -93,7 +93,7 @@ class Libav < TravisDepsBuilder
},
"ffmpeg-git" => {
:action => :git,
- :url => "git://git.ffmpeg.org/ffmpeg.git"
+ :url => "https://github.com/FFmpeg/FFmpeg.git"
}
}
end