From eb831aaf1433bf754ed0ffe2977156a7351145e4 Mon Sep 17 00:00:00 2001 From: "C.W. Betts" Date: Tue, 1 Dec 2020 16:25:48 -0700 Subject: [PATCH] Make universal binary version of ffmpeg work. (#13457) * Make universal binary version of ffmpeg work. * Update ffmpeg * Update ffmpeg dependancy. --- CMakeLists.txt | 2 +- ffmpeg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 516bc256ad..14dc47f123 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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") diff --git a/ffmpeg b/ffmpeg index d3e695286c..0b28335ace 160000 --- a/ffmpeg +++ b/ffmpeg @@ -1 +1 @@ -Subproject commit d3e695286cce346274192c214c00f021c00cd575 +Subproject commit 0b28335acea4f429ae798c5e75232e54881bf164