diff options
| author |  wm4 <wm4@nowhere> | 2017-10-27 18:13:02 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-10-27 18:13:02 +0200 |
| commit | 47dca74f0399054623a20b983c6e61c8ca0450a4 (patch) | |
| tree | 8be9e4fc3c1caec5cb3d867bab49f3e5bbe1d69e | |
| parent | 4d47805a761c588bb368076f42906ff2522dd90e (diff) | |
travis: adjust ffmpeg URL
No idea if this is correct.
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | TOOLS/travis-deps | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 4f8e976396..321bfbb818 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ matrix: - os: osx compiler: gcc - os: linux - env: LIBAV=ffmpeg-stable + env: LIBAV=ffmpeg-git - os: linux compiler: clang diff --git a/TOOLS/travis-deps b/TOOLS/travis-deps index 8206c6b597..2925372edc 100755 --- a/TOOLS/travis-deps +++ b/TOOLS/travis-deps @@ -91,13 +91,9 @@ class Libav < TravisDepsBuilder :action => :git, :url => "git://git.libav.org/libav.git" }, - "ffmpeg-stable" => { - :action => :stable, - :url => 'http://www.ffmpeg.org/releases/ffmpeg-3.2.2.tar.gz' - }, "ffmpeg-git" => { :action => :git, - :url => "git://github.com/FFmpeg/FFmpeg.git" + :url => "git://github.com/mpv-player/ffmpeg-mpv.git" } } end @@ -110,7 +106,7 @@ end class LibavOsx < Libav def build_map { - "ffmpeg-stable" => { :action => :package, :url => 'ffmpeg' }, + "ffmpeg-git" => { :action => :package, :url => 'ffmpeg' }, } end end |