diff options
| author | Nuno Sénica <nuno.senica@booking.com> | 2017-02-11 14:19:55 +0100 |
|---|---|---|
| committer | Nuno Sénica <nuno.senica@booking.com> | 2017-02-11 14:19:55 +0100 |
| commit | 285e1ecf9ffc513fea6c6803b31e56a52eae35e6 (patch) | |
| tree | 0815fc5540f6271a9f0f0f4c9bdbcdcf92e7a7fa /tools | |
| parent | c046d8bdf349198b8bd52e6f9a1b3e3b0c1635d4 (diff) | |
Unify setting for RPi, there's no need to make it CPU specific.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/target/ffmpeg/CMakeLists.txt | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/tools/depends/target/ffmpeg/CMakeLists.txt b/tools/depends/target/ffmpeg/CMakeLists.txt index 5bc3d791f9..0a9e9d38ea 100644 --- a/tools/depends/target/ffmpeg/CMakeLists.txt +++ b/tools/depends/target/ffmpeg/CMakeLists.txt @@ -57,15 +57,10 @@ elseif(CORE_SYSTEM_NAME STREQUAL osx) --target-os=darwin --disable-securetransport) elseif(CORE_SYSTEM_NAME STREQUAL rbpi) - if(CPU STREQUAL "cortex-a7" OR CPU STREQUAL "cortex-a53") - list(APPEND ffmpeg_conf --cpu=${CPU} --enable-pic --disable-armv5te --disable-armv6t2) - endif() - list(APPEND ffmpeg_conf --enable-hardcoded-tables --disable-vaapi --disable-vdpau --enable-mmal - --enable-omx-rpi) - + list(APPEND ffmpeg_conf --cpu=${CPU} --disable-vaapi --disable-vdpau) endif() -if(CPU MATCHES arm) +if(CPU MATCHES arm OR CORE_SYSTEM_NAME STREQUAL rbpi) list(APPEND ffmpeg_conf --enable-pic --disable-armv5te --disable-armv6t2) elseif(CPU MATCHES mips) list(APPEND ffmpeg_conf --disable-mips32r2 --disable-mipsdspr1 --disable-mipsdspr2) |