From 2034ddd99b0ec26270999fbb11f1fb03202d27ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= Date: Mon, 14 Aug 2017 01:45:28 +0200 Subject: build_ffmpeg.sh: Use yasm for now to avoid MSBuild issue. See https://github.com/Microsoft/msbuild/issues/2424 Also sync build options with upstream. --- src/thirdparty/LAVFilters/build_ffmpeg.sh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/thirdparty/LAVFilters/build_ffmpeg.sh b/src/thirdparty/LAVFilters/build_ffmpeg.sh index ce76275f8..e595c178e 100755 --- a/src/thirdparty/LAVFilters/build_ffmpeg.sh +++ b/src/thirdparty/LAVFilters/build_ffmpeg.sh @@ -72,13 +72,6 @@ configure() { --enable-muxer=spdif \ --disable-bsfs \ --enable-bsf=extract_extradata,vp9_superframe \ - --disable-hwaccels \ - --enable-hwaccel=h264_dxva2 \ - --enable-hwaccel=hevc_dxva2 \ - --enable-hwaccel=vc1_dxva2 \ - --enable-hwaccel=wmv3_dxva2 \ - --enable-hwaccel=mpeg2_dxva2 \ - --enable-hwaccel=vp9_dxva2 \ --disable-cuda \ --disable-cuvid \ --disable-nvenc \ @@ -109,7 +102,7 @@ configure() { EXTRA_LDFLAGS="${EXTRA_LDFLAGS} -L../../../thirdparty/lib32" fi - sh ../../../ffmpeg/configure --extra-ldflags="${EXTRA_LDFLAGS}" --extra-cflags="${EXTRA_CFLAGS}" ${OPTIONS} + sh ../../../ffmpeg/configure --x86asmexe=yasm --extra-ldflags="${EXTRA_LDFLAGS}" --extra-cflags="${EXTRA_CFLAGS}" ${OPTIONS} } build() { -- cgit v1.2.3