ci: update ffmpeg. old ones result in link error

ahnan4arch · Dec 15, 2014 · 941a499 · 941a499
1 parent 32fc5d3
commit 941a499
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/scripts/build_ffmpeg.sh b/scripts/build_ffmpeg.sh
@@ -198,7 +198,7 @@ FFMAJOR=`pwd |sed 's,.*-\(.*\)\..*\..*,\1,'`
 FFMINOR=`pwd |sed 's,.*\.\(.*\)\..*,\1,'`
 [ $FFMAJOR -eq 0 -a $FFMINOR -lt 11 ] && AVR_OPT=
 
-CONFIGURE="./$CONFIGURE --extra-version=QtAV --disable-static --enable-shared --enable-gpl --enable-version3 --enable-runtime-cpudetect $AVR_OPT --disable-muxers --disable-encoders --enable-hwaccels --enable-opengl $PLATFORM_OPT $TOOLCHAIN_OPT"
+CONFIGURE="./$CONFIGURE --extra-version=QtAV --disable-static --enable-shared --enable-gpl --enable-version3 --enable-runtime-cpudetect $AVR_OPT --disable-muxers --disable-encoders --enable-hwaccels $PLATFORM_OPT $TOOLCHAIN_OPT"
 
 
 echo $CONFIGURE

diff --git a/tools/ci/travis_build.sh b/tools/ci/travis_build.sh
@@ -20,7 +20,7 @@ cd build
 #ffmpeg 2.3 libavutil clock_gettime need -lrt if glibc < 2.17
 FFMPEG=$1
 : ${FFMPEG:=ffmpeg-2.2.5}
-FFVER=(1.0.9 1.1.12 1.2.7 2.0.5 2.1.5 2.2.5)
+FFVER=(1.0.10 1.2.10 2.0.6 2.2.11 2.4.4)
 MKSPEC=(linux-clang)
 
 export QT_PKG=Qt5.3.1-Linux64