Commit 00ba1871 authored by Seb's avatar Seb
Browse files

Install ffmpeg in travis.yml not seperate script

parent 65c2651e
......@@ -16,9 +16,12 @@ env:
- DJANGO='18' WAGTAIL='15'
- DJANGO='19' WAGTAIL='15'
before_install:
- sudo add-apt-repository ppa:mc3man/trusty-media -y
- sudo apt-get update -q
- sudo apt-get install ffmpeg -y
install:
- ./tests/scripts/install-ffmpeg.sh
- pip install --upgrade pip wheel tox
cache:
......
sudo add-apt-repository -y ppa:mc3man/trusty-media
sudo apt-get update
sudo apt-get install -y ffmpeg
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment