Skip to content

Commit

Permalink
travis: try another ffmpeg repo
Browse files Browse the repository at this point in the history
  • Loading branch information
devernay committed Oct 12, 2016
1 parent cb04abf commit 964d771
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ addons:
# NOT WHITELISTED
- sourceline: 'ppa:spvkgn/ffmpeg-dev'
# this one is for trusty ffmpeg
- sourceline: 'ppa:mc3man/trusty-media'
- sourceline: 'ppa:jonathonf/ffmpeg-3'
- kalakris-cmake
- pythonxy-devel
packages:
Expand Down
2 changes: 1 addition & 1 deletion tools/travis/install_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
#if [ "$CC" = "$TEST_CC" ]; then sudo add-apt-repository -y ppa:archivematica/externals; fi #2.5.1
#if [ "$CC" = "$TEST_CC" ]; then sudo add-apt-repository -y ppa:pavlyshko/precise; fi #2.6.1
if [ `lsb_release -cs` = "trusty" ]; then
if [ "$CC" = "$TEST_CC" ]; then sudo add-apt-repository -y ppa:mc3man/trusty-media; fi #3.1.4
if [ "$CC" = "$TEST_CC" ]; then sudo add-apt-repository -y ppa:jonathonf/ffmpeg-3; fi #3.1.4
else
if [ "$CC" = "$TEST_CC" ]; then sudo add-apt-repository -y ppa:spvkgn/ffmpeg-dev; fi #2.8.6 (on precise)
fi
Expand Down

0 comments on commit 964d771

Please sign in to comment.