[Bf-blender-cvs] [cae18abef47] master: deps/win: Remove media foundation dep for ffmpeg
Ray Molenkamp
noreply at git.blender.org
Thu Jul 29 18:21:49 CEST 2021
Commit: cae18abef47d6aeacf54ccf8f05c5cece11afd91
Author: Ray Molenkamp
Date: Thu Jul 29 10:21:43 2021 -0600
Branches: master
https://developer.blender.org/rBcae18abef47d6aeacf54ccf8f05c5cece11afd91
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
===================================================================
M build_files/build_environment/cmake/ffmpeg.cmake
===================================================================
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
More information about the Bf-blender-cvs
mailing list