Skip to content

Commit 2fc0349

Browse files
build(deps): bump third-party/FFmpeg/FFmpeg from 4c78a35 to 9373b44 (#438)
* build(deps): bump third-party/FFmpeg/FFmpeg from `4c78a35` to `9373b44` Bumps [third-party/FFmpeg/FFmpeg](https://github.com/FFmpeg/FFmpeg) from `4c78a35` to `9373b44`. - [Commits](FFmpeg/FFmpeg@4c78a35...9373b44) --- updated-dependencies: - dependency-name: third-party/FFmpeg/FFmpeg dependency-version: 9373b442a689455bb5fcfddcfe70dfb8e4352fbc dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * fix(ffmpeg): drop arm64 arch flag --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ReenigneArcher <[email protected]>
1 parent 38aeae4 commit 2fc0349

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

cmake/ffmpeg/ffmpeg.cmake

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,20 +60,10 @@ if(WIN32)
6060
--enable-mediafoundation
6161
)
6262

63-
# On Windows Arm64
64-
# We must specify the arch parameter until one of the following issues is resolved
65-
#
66-
# https://github.com/msys2/msys2-runtime/issues/171
67-
# https://github.com/FFmpeg/FFmpeg/blob/4e5523c98597a417eb43555933b1075d18ec5f8b/configure#L4161
68-
#
6963
# We must disable CUDA and NVENC until following issues is resolved
7064
#
7165
# https://github.com/FFmpeg/FFmpeg/blob/4e5523c98597a417eb43555933b1075d18ec5f8b/configure#L7443
72-
if(${arch} STREQUAL "aarch64" OR ${arch} STREQUAL "arm64")
73-
list(APPEND FFMPEG_EXTRA_CONFIGURE
74-
--arch=${arch}
75-
)
76-
elseif (${arch} STREQUAL "amd64" OR ${arch} STREQUAL "x86_64")
66+
if (${arch} STREQUAL "amd64" OR ${arch} STREQUAL "x86_64")
7767
list(APPEND FFMPEG_EXTRA_CONFIGURE
7868
--enable-cuda
7969
--enable-encoder=h264_nvenc,hevc_nvenc,av1_nvenc

third-party/FFmpeg/FFmpeg

Submodule FFmpeg updated 1 file

0 commit comments

Comments
 (0)