Skip to content

Commit e4f00a4

Browse files
committed
Merge branch 'buildffmpegwindowsmsvc' into windows-tests
2 parents 3b79ff5 + 8450297 commit e4f00a4

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

packaging/build_ffmpeg.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
set -eux
2121

2222
prefix="${FFMPEG_ROOT}"
23+
args=""
24+
if [[ "$OSTYPE" == "msys" ]]; then
25+
args="--toolchain=msvc"
26+
fi
2327
archive="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/n${FFMPEG_VERSION}.tar.gz"
2428

2529
build_dir=$(mktemp -d -t ffmpeg-build.XXXXXXXXXX)
@@ -62,7 +66,7 @@ tar -xf ffmpeg.tar.gz --strip-components 1
6266
--enable-avformat \
6367
--enable-avutil \
6468
--enable-swscale \
65-
--enable-swresample
69+
--enable-swresample ${args}
6670

6771
make -j install
6872
ls ${prefix}/*

0 commit comments

Comments
 (0)