jyapayne/Sunshine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FFmpeg updates with QSV-enabled builds (#730)

Browse source
This commit is contained in:
Brad Richardson 2023-01-09 08:24:21 -05:00 • committed by GitHub
commit 3af1744c9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/CI.yml vendored
View file

@ -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

2
CMakeLists.txt
View file

@ -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")

3
docs/source/building/windows.rst
View file

@ -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
----------------

2
third-party/ffmpeg-linux-aarch64 vendored

@ -1 +1 @@
Subproject commit 0341a8fe5a90cd3ea297de3af479dae336370993
Subproject commit 1f42e213d3b560448379bcb17caf74f517e9b73d

2
third-party/ffmpeg-linux-x86_64 vendored

@ -1 +1 @@
Subproject commit 999e6746bdf3f4ce2e5eda2e6f8d6ea92cb5372a
Subproject commit 08a8ae6100814e7cbe51eec01c9c9274411730ae

2
third-party/ffmpeg-macos-aarch64 vendored

@ -1 +1 @@
Subproject commit 3507f2d5793a1809e522e7fcf98bad5758653f43
Subproject commit 17142b9797cde8f29d08cafa6cec9e3923ce1e05

2
third-party/ffmpeg-macos-x86_64 vendored

@ -1 +1 @@
Subproject commit 01421e5a1435d0428d335ea1c19a9e0720180cbe
Subproject commit 924d4cde9b88aa53aff3b28c671cd8e390a95b0d

2
third-party/ffmpeg-windows-x86_64 vendored

@ -1 +1 @@
Subproject commit e0ba0df13687bd6355564bfd0e1dc690856abde3
Subproject commit daf81fde766f8d0fa05a1c2f072d5d494c3a5ffa