From 1e80f47eced3aa37771f8518aadd14046049d0d1 Mon Sep 17 00:00:00 2001 From: Brad Richardson Date: Tue, 3 Jan 2023 21:28:36 -0500 Subject: [PATCH 1/2] FFmpeg updates with QSV-enabled builds --- .github/workflows/CI.yml | 1 + CMakeLists.txt | 2 +- third-party/ffmpeg-linux-aarch64 | 2 +- third-party/ffmpeg-linux-x86_64 | 2 +- third-party/ffmpeg-macos-aarch64 | 2 +- third-party/ffmpeg-macos-x86_64 | 2 +- third-party/ffmpeg-windows-x86_64 | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 970191bc1a8..5cff4180413 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -886,6 +886,7 @@ jobs: mingw-w64-x86_64-boost mingw-w64-x86_64-cmake mingw-w64-x86_64-curl + mingw-w64-x86_64-libmfx mingw-w64-x86_64-nsis mingw-w64-x86_64-openssl mingw-w64-x86_64-opus diff --git a/CMakeLists.txt b/CMakeLists.txt index b1970b1d224..2305eab86fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -388,7 +388,7 @@ set_source_files_properties(src/upnp.cpp PROPERTIES COMPILE_FLAGS -Wno-pedantic) # Pre-compiled binaries if(WIN32) set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-windows-x86_64") - set(FFMPEG_PLATFORM_LIBRARIES mfplat ole32 strmiids mfuuid) + set(FFMPEG_PLATFORM_LIBRARIES mfplat ole32 strmiids mfuuid mfx) elseif(APPLE) if (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-macos-aarch64") diff --git a/third-party/ffmpeg-linux-aarch64 b/third-party/ffmpeg-linux-aarch64 index 0341a8fe5a9..1f42e213d3b 160000 --- a/third-party/ffmpeg-linux-aarch64 +++ b/third-party/ffmpeg-linux-aarch64 @@ -1 +1 @@ -Subproject commit 0341a8fe5a90cd3ea297de3af479dae336370993 +Subproject commit 1f42e213d3b560448379bcb17caf74f517e9b73d diff --git a/third-party/ffmpeg-linux-x86_64 b/third-party/ffmpeg-linux-x86_64 index 999e6746bdf..08a8ae61008 160000 --- a/third-party/ffmpeg-linux-x86_64 +++ b/third-party/ffmpeg-linux-x86_64 @@ -1 +1 @@ -Subproject commit 999e6746bdf3f4ce2e5eda2e6f8d6ea92cb5372a +Subproject commit 08a8ae6100814e7cbe51eec01c9c9274411730ae diff --git a/third-party/ffmpeg-macos-aarch64 b/third-party/ffmpeg-macos-aarch64 index 3507f2d5793..17142b9797c 160000 --- a/third-party/ffmpeg-macos-aarch64 +++ b/third-party/ffmpeg-macos-aarch64 @@ -1 +1 @@ -Subproject commit 3507f2d5793a1809e522e7fcf98bad5758653f43 +Subproject commit 17142b9797cde8f29d08cafa6cec9e3923ce1e05 diff --git a/third-party/ffmpeg-macos-x86_64 b/third-party/ffmpeg-macos-x86_64 index 01421e5a143..924d4cde9b8 160000 --- a/third-party/ffmpeg-macos-x86_64 +++ b/third-party/ffmpeg-macos-x86_64 @@ -1 +1 @@ -Subproject commit 01421e5a1435d0428d335ea1c19a9e0720180cbe +Subproject commit 924d4cde9b88aa53aff3b28c671cd8e390a95b0d diff --git a/third-party/ffmpeg-windows-x86_64 b/third-party/ffmpeg-windows-x86_64 index e0ba0df1368..daf81fde766 160000 --- a/third-party/ffmpeg-windows-x86_64 +++ b/third-party/ffmpeg-windows-x86_64 @@ -1 +1 @@ -Subproject commit e0ba0df13687bd6355564bfd0e1dc690856abde3 +Subproject commit daf81fde766f8d0fa05a1c2f072d5d494c3a5ffa From 8c1e0aef03873eb496999d01a5b56e92bd6c5847 Mon Sep 17 00:00:00 2001 From: Brad Richardson Date: Sun, 8 Jan 2023 15:40:16 -0500 Subject: [PATCH 2/2] Update build docs --- docs/source/building/windows.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/source/building/windows.rst b/docs/source/building/windows.rst index 82b0dfe6c3d..0cfb53a488a 100644 --- a/docs/source/building/windows.rst +++ b/docs/source/building/windows.rst @@ -16,7 +16,8 @@ Install dependencies: pacman -S base-devel cmake diffutils gcc git make mingw-w64-x86_64-binutils \ mingw-w64-x86_64-boost mingw-w64-x86_64-cmake mingw-w64-x86_64-curl \ - mingw-w64-x86_64-openssl mingw-w64-x86_64-opus mingw-w64-x86_64-toolchain + mingw-w64-x86_64-libmfx mingw-w64-x86_64-openssl mingw-w64-x86_64-opus \ + mingw-w64-x86_64-toolchain npm dependencies ----------------