diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2018-05-15 09:20:55 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2018-05-15 09:20:55 +0300 |
| commit | 029ac8dc15b247808cbd6f65dfdbb941628361b9 (patch) | |
| tree | 018f566e02247589f2ab2539d332afb2b309314c /build_files | |
| parent | 0ac09ed0dae7e57c7eb559905c6b296a7259d067 (diff) | |
| parent | 04fa65e356dac5b876eae64af59fcd52b9645724 (diff) | |
Merge branch 'blender2.8' into hair_guides
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/build_environment/cmake/ffmpeg.cmake | 1 |
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 bd49621bf26..3ea1b282d9a 100644 --- a/build_files/build_environment/cmake/ffmpeg.cmake +++ b/build_files/build_environment/cmake/ffmpeg.cmake @@ -103,6 +103,7 @@ ExternalProject_Add(external_ffmpeg --disable-indev=jack --disable-indev=alsa --disable-outdev=alsa + --disable-crystalhd PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/ffmpeg/src/external_ffmpeg < ${PATCH_DIR}/ffmpeg.diff BUILD_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ && make -j${MAKE_THREADS} INSTALL_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ && make install |