diff --git a/.travis.yml b/.travis.yml index 9861ccf660..a0b0478842 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: diff --git a/tools/travis/install_dependencies.sh b/tools/travis/install_dependencies.sh index aab5148a5c..4014f021fe 100755 --- a/tools/travis/install_dependencies.sh +++ b/tools/travis/install_dependencies.sh @@ -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