diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-04-23 13:06:58 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-04-23 16:17:39 +0400 |
| commit | 60b015d1fc1005fd0eff29272ce5b66f8adb5755 (patch) | |
| tree | be09db979587c61b7012de13dd8445be4f4a9852 | |
| parent | dda567866924d4d9ce4be56235ec3e1a691492c7 (diff) | |
Update ffmpeg in install_deps.sh to 2.1.4.
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index b86b331d1b5..3cc6997f3ff 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -259,7 +259,7 @@ OPENCOLLADA_REPO_UID="18da7f4109a8eafaa290a33f5550501cc4c8bae8" OPENCOLLADA_FORCE_REBUILD=false OPENCOLLADA_SKIP=false -FFMPEG_VERSION="1.0" +FFMPEG_VERSION="2.1.4" FFMPEG_SOURCE="http://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.bz2" FFMPEG_VERSION_MIN="0.7.6" FFMPEG_FORCE_REBUILD=false @@ -1626,8 +1626,9 @@ compile_FFmpeg() { --disable-bzlib --disable-libgsm --disable-libspeex \ --enable-pthreads --enable-zlib --enable-stripping --enable-runtime-cpudetect \ --disable-vaapi --disable-libfaac --disable-nonfree --enable-gpl \ - --disable-postproc --disable-x11grab --disable-librtmp --disable-libopencore-amrnb \ + --disable-postproc --disable-librtmp --disable-libopencore-amrnb \ --disable-libopencore-amrwb --disable-libdc1394 --disable-version3 --disable-outdev=sdl \ + --disable-outdev=xv \ --disable-outdev=alsa --disable-indev=sdl --disable-indev=alsa --disable-indev=jack \ --disable-indev=lavfi $extra |