[Bf-blender-cvs] [60b015d] master: Update ffmpeg in install_deps.sh to 2.1.4.
Bastien Montagne
noreply at git.blender.org
Wed Apr 23 15:08:32 CEST 2014
Commit: 60b015d1fc1005fd0eff29272ce5b66f8adb5755
Author: Bastien Montagne
Date: Wed Apr 23 11:06:58 2014 +0200
https://developer.blender.org/rB60b015d1fc1005fd0eff29272ce5b66f8adb5755
Update ffmpeg in install_deps.sh to 2.1.4.
===================================================================
M build_files/build_environment/install_deps.sh
===================================================================
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index b86b331..3cc6997 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
More information about the Bf-blender-cvs
mailing list