* Disable assembly optimizations for libx264 with FFmpeg on Mac to w…

…ork around crashes (issue bytedeco/javacv#1519)
bytedeco · Oct 13, 2020 · 4e2cc03 · 4e2cc03
1 parent 55e0e0f
commit 4e2cc03
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 
+ * Disable assembly optimizations for libx264 with FFmpeg on Mac to work around crashes ([issue bytedeco/javacv#1519](https://github.com/bytedeco/javacv/issues/1519))
  * Add `linux-armhf` and `linux-arm64` builds for librealsense and librealsense2 ([pull #951](https://github.com/bytedeco/javacpp-presets/pull/951))
  * License default builds of FFmpeg under LGPL v3 and move GPL-enabled builds to `-gpl` extension ([pull #950](https://github.com/bytedeco/javacpp-presets/pull/950))
  * Upgrade presets for librealsense2 2.38.1 ([pull #946](https://github.com/bytedeco/javacpp-presets/pull/946)), DNNL 1.6.3, NumPy 1.19.2, Gym 0.17.3, TensorFlow 1.15.4, ONNX Runtime 1.5.1, Qt 5.15.1, cpu_features 0.5.0, and their dependencies

diff --git a/ffmpeg/cppbuild.sh b/ffmpeg/cppbuild.sh
@@ -1224,7 +1224,7 @@ EOF
         cd ../openh264-$OPENH264_VERSION
         make -j $MAKEJ DESTDIR=./ PREFIX=.. AR=ar USE_ASM=No install-static
         cd ../$X264
-        ./configure --prefix=$INSTALL_PATH --enable-static --enable-pic --disable-opencl
+        ./configure --prefix=$INSTALL_PATH --enable-static --enable-pic --disable-opencl --disable-asm
         make -j $MAKEJ V=0
         make install
         cd ../x265-$X265/build/linux