Merge branch 'master' into master

Author: bobfriesenhahn

projects/ffmpeg/build.sh

@@ -105,19 +105,19 @@ make -j$(nproc) install
 
 cd $SRC/libvpx
 if [[ "$SANITIZER" == "memory" ]] || [[ "$FUZZING_ENGINE" == "centipede" ]]; then
-      TARGET="--target=generic-gnu"
+      LIBVPX_BUILD_ARGS="--disable-x86-asm"
 elif [[ "$ARCHITECTURE" == i386 ]]; then
-      TARGET="--target=x86-linux-gcc"
+      LIBVPX_BUILD_ARGS="--target=x86-linux-gcc"
 else
-      TARGET=""
+      LIBVPX_BUILD_ARGS=""
 fi
 
 LDFLAGS="$CXXFLAGS" ./configure --prefix="$FFMPEG_DEPS_PATH" \
         --disable-docs --disable-examples --disable-tools --disable-unit-tests \
         --enable-vp9-highbitdepth \
         --size-limit=12288x12288 \
         --extra-cflags="-DVPX_MAX_ALLOCABLE_MEMORY=1073741824" \
-        $TARGET
+        $LIBVPX_BUILD_ARGS
 
 make -j$(nproc) install