aboutsummaryrefslogtreecommitdiff
path: root/tools/depends/target/ffmpeg
diff options
context:
space:
mode:
authorpopcornmix <popcornmix@gmail.com>2020-09-09 19:19:29 +0100
committerGitHub <noreply@github.com>2020-09-09 19:19:29 +0100
commit811bd4933fbdab9b065c554c8880db4980183b54 (patch)
treef12a0473b1414159487b41f2388891ce04499c6d /tools/depends/target/ffmpeg
parenteb609cbe43eeacf045ddf1fa303c9224e3ca0799 (diff)
parent605b3b05dc8aee32a1238653a5f02ce5be25719a (diff)
Merge pull request #16321 from lrusak/rpi-removal
RPi: remove platform
Diffstat (limited to 'tools/depends/target/ffmpeg')
-rw-r--r--tools/depends/target/ffmpeg/CMakeLists.txt24
1 files changed, 10 insertions, 14 deletions
diff --git a/tools/depends/target/ffmpeg/CMakeLists.txt b/tools/depends/target/ffmpeg/CMakeLists.txt
index ac27049cdb..e358775911 100644
--- a/tools/depends/target/ffmpeg/CMakeLists.txt
+++ b/tools/depends/target/ffmpeg/CMakeLists.txt
@@ -39,20 +39,16 @@ if(CMAKE_BUILD_TYPE STREQUAL Release)
endif()
if(CORE_SYSTEM_NAME STREQUAL linux OR CORE_SYSTEM_NAME STREQUAL freebsd)
- if(CORE_PLATFORM_NAME STREQUAL rbpi)
- list(APPEND ffmpeg_conf --cpu=${CPU} --disable-vaapi --disable-vdpau)
+ list(APPEND ffmpeg_conf --enable-pic)
+ if(ENABLE_VAAPI)
+ list(APPEND ffmpeg_conf --enable-vaapi)
else()
- list(APPEND ffmpeg_conf --enable-pic)
- if(ENABLE_VAAPI)
- list(APPEND ffmpeg_conf --enable-vaapi)
- else()
- list(APPEND ffmpeg_conf --disable-vaapi)
- endif()
- if(ENABLE_VDPAU)
- list(APPEND ffmpeg_conf --enable-vdpau)
- else()
- list(APPEND ffmpeg_conf --disable-vdpau)
- endif()
+ list(APPEND ffmpeg_conf --disable-vaapi)
+ endif()
+ if(ENABLE_VDPAU)
+ list(APPEND ffmpeg_conf --enable-vdpau)
+ else()
+ list(APPEND ffmpeg_conf --disable-vdpau)
endif()
elseif(CORE_SYSTEM_NAME STREQUAL android)
if(CPU MATCHES arm64)
@@ -75,7 +71,7 @@ elseif(CORE_SYSTEM_NAME STREQUAL osx)
--disable-securetransport)
endif()
-if(CPU MATCHES arm OR CORE_PLATFORM_NAME STREQUAL rbpi)
+if(CPU MATCHES arm)
list(APPEND ffmpeg_conf --enable-pic --disable-armv5te --disable-armv6t2)
elseif(CPU MATCHES mips)
list(APPEND ffmpeg_conf --disable-mips32r2 --disable-mipsdsp --disable-mipsdspr2)