diff options
| author | Bastien Montagne <bastien@blender.org> | 2021-06-07 17:24:08 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2021-06-07 17:25:34 +0300 |
| commit | 93a865dde775ea5611ceab1505950df90b009dd3 (patch) | |
| tree | 70c004d553c7f6cd74e7fa776901ae8d53059820 | |
| parent | 72d2355af525664671ed6089b31d5bbe126cd865 (diff) | |
Revert "Bump FFmpeg version from 4.2.3 to 4.4"
This reverts commit 95690dd362f3a94f6c3b1efbe91e8b5cc164745f.
Such high version restriction is no more needed after rB9225fe933ae990.
Missing bit in https://developer.blender.org/D11417.
| -rw-r--r-- | build_files/build_environment/cmake/versions.cmake | 6 | ||||
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index 4500245d42a..88f84614867 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -297,10 +297,10 @@ set(OPENJPEG_HASH 63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6 set(OPENJPEG_HASH_TYPE SHA256) set(OPENJPEG_FILE openjpeg-v${OPENJPEG_VERSION}.tar.gz) -set(FFMPEG_VERSION 4.4) +set(FFMPEG_VERSION 4.2.3) set(FFMPEG_URI http://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2) -set(FFMPEG_HASH 42093549751b582cf0f338a21a3664f52e0a9fbe0d238d3c992005e493607d0e) -set(FFMPEG_HASH_TYPE SHA256) +set(FFMPEG_HASH 695fad11f3baf27784e24cb0e977b65a) +set(FFMPEG_HASH_TYPE MD5) set(FFMPEG_FILE ffmpeg-${FFMPEG_VERSION}.tar.bz2) set(FFTW_VERSION 3.3.8) diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 71ddeaa4576..18922799d08 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -563,9 +563,9 @@ OIDN_SKIP=false ISPC_VERSION="1.14.1" -FFMPEG_VERSION="4.4" -FFMPEG_VERSION_SHORT="4.4" -FFMPEG_VERSION_MIN="4.4" +FFMPEG_VERSION="4.2.3" +FFMPEG_VERSION_SHORT="4.2" +FFMPEG_VERSION_MIN="3.0" FFMPEG_VERSION_MAX="5.0" FFMPEG_FORCE_BUILD=false FFMPEG_FORCE_REBUILD=false |