izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use oneVPL instead of legacy MFX library on Windows

Browse Source
This commit is contained in:
Cameron Gutman
2023-10-01 18:40:38 -05:00
parent f838069a0e
commit 366c5ab675
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/CI.yml
+1 -1
View File
@@ -715,7 +715,7 @@ jobs:
mingw-w64-x86_64-boost mingw-w64-x86_64-boost
mingw-w64-x86_64-cmake mingw-w64-x86_64-cmake
mingw-w64-x86_64-curl mingw-w64-x86_64-curl
mingw-w64-x86_64-libmfx mingw-w64-x86_64-onevpl
mingw-w64-x86_64-nsis mingw-w64-x86_64-nsis
mingw-w64-x86_64-openssl mingw-w64-x86_64-openssl
mingw-w64-x86_64-opus mingw-w64-x86_64-opus
cmake/dependencies/common.cmake
+1 -1
View File
@@ -22,7 +22,7 @@ if(WIN32)
if(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") if(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64")
message(FATAL_ERROR "Unsupported system processor:" ${CMAKE_SYSTEM_PROCESSOR}) message(FATAL_ERROR "Unsupported system processor:" ${CMAKE_SYSTEM_PROCESSOR})
endif() endif()
set(FFMPEG_PLATFORM_LIBRARIES mfplat ole32 strmiids mfuuid mfx) set(FFMPEG_PLATFORM_LIBRARIES mfplat ole32 strmiids mfuuid vpl)
set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-windows-x86_64") set(FFMPEG_PREPARED_BINARIES "${CMAKE_CURRENT_SOURCE_DIR}/third-party/ffmpeg-windows-x86_64")
elseif(APPLE) elseif(APPLE)
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
docs/source/building/windows.rst
+1 -1
View File
@@ -16,7 +16,7 @@ Install dependencies:
pacman -S base-devel cmake diffutils gcc git make mingw-w64-x86_64-binutils \ 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-boost mingw-w64-x86_64-cmake mingw-w64-x86_64-curl \
mingw-w64-x86_64-libmfx mingw-w64-x86_64-openssl mingw-w64-x86_64-opus \ mingw-w64-x86_64-onevpl mingw-w64-x86_64-openssl mingw-w64-x86_64-opus \
mingw-w64-x86_64-toolchain mingw-w64-x86_64-toolchain
npm dependencies npm dependencies