From: Bigard Florian <florian.bigard@gmail.com>
Date: Wed, 11 May 2016 21:00:44 +0000 (+0200)
Subject: Try another method to install latest ffmpeg
X-Git-Tag: v0.0.1-alpha~948
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6f1b0869809593af36e5ea6a675b6a32a1172f20;p=oweals%2Fpeertube.git

Try another method to install latest ffmpeg
---

diff --git a/.travis.yml b/.travis.yml
index a5c55e4fc..0d271c8a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ addons:
     packages:
       - g++-4.8
 
-sudo: true
+sudo: false
 
 services:
   - mongodb
@@ -22,9 +22,10 @@ services:
 before_script:
   - npm install electron-prebuilt -g
   - npm run build
-  - sudo add-apt-repository ppa:pavlyshko/precise -y
-  - sudo apt-get update -q
-  - sudo apt-get install ffmpeg -y
+  - mkdir ffmpeg
+  - wget "http://ffmpeg.gusari.org/static/64bit/ffmpeg.static.64bit.latest.tar.gz"
+  - tar xzf ffmpeg.static.64bit.latest.tar.gz -C ffmpeg
+  - export PATH=`pwd`/ffmpeg:$PATH
 
 after_failure:
   - cat test1/logs/all-logs.log