Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 05:19:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Make universal binary version of ffmpeg work. (#13457)

Browse Source 
* Make universal binary version of ffmpeg work.

* Update ffmpeg

* Update ffmpeg dependancy.
This commit is contained in:
C.W. Betts 2020-12-01 16:25:48 -07:00 committed by GitHub
parent c0c2bfb293
commit eb831aaf14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -675,7 +675,7 @@ if(USE_FFMPEG)
elseif(IOS)
set(PLATFORM_ARCH "ios/universal")
elseif(MACOSX)
set(PLATFORM_ARCH "macosx/x86_64")
set(PLATFORM_ARCH "macosx/universal")
elseif(LINUX)
if(ARMV7)
set(PLATFORM_ARCH "linux/armv7")

2
ffmpeg

@ -1 +1 @@
Subproject commit d3e695286cce346274192c214c00f021c00cd575
Subproject commit 0b28335acea4f429ae798c5e75232e54881bf164