Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Molenkamp <github@lazydodo.com>2021-07-29 19:21:43 +0300
committerRay Molenkamp <github@lazydodo.com>2021-07-29 19:21:43 +0300
commitcae18abef47d6aeacf54ccf8f05c5cece11afd91 (patch)
tree81b22e7681118b7ed2a429075fe43368981b5199
parent8f12457c256acebb17942260c2807789357daef7 (diff)
deps/win: Remove media foundation dep for ffmpeg
This caused a blender load error on windows N, given we do not use these codecs they can safely be disabled. This will fix T90200 once the new libraries are in SVN
-rw-r--r--build_files/build_environment/cmake/ffmpeg.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/build_files/build_environment/cmake/ffmpeg.cmake b/build_files/build_environment/cmake/ffmpeg.cmake
index 2dad9c38877..81bcb6d202c 100644
--- a/build_files/build_environment/cmake/ffmpeg.cmake
+++ b/build_files/build_environment/cmake/ffmpeg.cmake
@@ -30,6 +30,7 @@ if(WIN32)
--enable-w32threads
--disable-pthreads
--enable-libopenjpeg
+ --disable-mediafoundation
)
if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
set(FFMPEG_EXTRA_FLAGS