diff options
| author | Wolfgang Schupp <w.schupp@a1.net> | 2017-09-01 11:20:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-01 11:20:15 +0200 |
| commit | a771f9fa207a9270bd255cf0f464a583ff93980a (patch) | |
| tree | aa0572d6bb185d33c2a2c1e793d608bad47b0cbc /tools | |
| parent | e22038f8ee5789d7d4e9867dd93d9e3c776db243 (diff) | |
| parent | a0515ccbc327dcaeac40fd968656d39bc5689b5b (diff) | |
Merge pull request #12747 from PIPplware/v18_rbpi_compilation
FFMPEG: Fixes rbpi compilation
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/target/ffmpeg/CMakeLists.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/depends/target/ffmpeg/CMakeLists.txt b/tools/depends/target/ffmpeg/CMakeLists.txt index bedf76fa4f..f0e06bb063 100644 --- a/tools/depends/target/ffmpeg/CMakeLists.txt +++ b/tools/depends/target/ffmpeg/CMakeLists.txt @@ -35,7 +35,11 @@ if(CMAKE_BUILD_TYPE STREQUAL Release) endif() if(CORE_SYSTEM_NAME STREQUAL linux OR CORE_SYSTEM_NAME STREQUAL freebsd) - list(APPEND ffmpeg_conf --enable-vdpau --enable-vaapi --enable-pic) + if(CORE_PLATFORM_NAME STREQUAL rbpi) + list(APPEND ffmpeg_conf --cpu=${CPU} --disable-vaapi --disable-vdpau) + else() + list(APPEND ffmpeg_conf --enable-vdpau --enable-vaapi --enable-pic) + endif() elseif(CORE_SYSTEM_NAME STREQUAL android) if(CPU MATCHES arm64) list(APPEND ffmpeg_conf --cpu=cortex-a53 --arch=aarch64) @@ -58,8 +62,6 @@ elseif(CORE_SYSTEM_NAME STREQUAL osx) --disable-decoder=mpeg_xvmc --disable-vda --disable-crystalhd --enable-videotoolbox --target-os=darwin --disable-securetransport) -elseif(CORE_PLATFORM_NAME STREQUAL rbpi) - list(APPEND ffmpeg_conf --cpu=${CPU} --disable-vaapi --disable-vdpau) endif() if(CPU MATCHES arm OR CORE_PLATFORM_NAME STREQUAL rbpi) |