diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2022-01-12 21:07:40 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-01-12 21:07:40 +0300 |
| commit | e594f23a27fe01a1b34345a25914ce7defe9c62a (patch) | |
| tree | 80976ba734f4482819a932d82b7317f60d40ae49 /build_files/cmake/Modules/FindFFmpeg.cmake | |
| parent | fa8c2c78857989c23262915921722cf69399d58d (diff) | |
Revert "CMake: use FFmpeg find module on Linux"
This reverts commit 62a0de1673302fb7f15fe06efaf6f0f97d92d240. Linux buildbot
is giving link errors.
Diffstat (limited to 'build_files/cmake/Modules/FindFFmpeg.cmake')
| -rw-r--r-- | build_files/cmake/Modules/FindFFmpeg.cmake | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/build_files/cmake/Modules/FindFFmpeg.cmake b/build_files/cmake/Modules/FindFFmpeg.cmake index 5f506a33e13..0765c1dc901 100644 --- a/build_files/cmake/Modules/FindFFmpeg.cmake +++ b/build_files/cmake/Modules/FindFFmpeg.cmake @@ -33,8 +33,6 @@ if(NOT FFMPEG_FIND_COMPONENTS) avfilter avformat avutil - swscale - swresample ) endif() @@ -52,9 +50,9 @@ foreach(_component ${FFMPEG_FIND_COMPONENTS}) string(TOUPPER ${_component} _upper_COMPONENT) find_library(FFMPEG_${_upper_COMPONENT}_LIBRARY NAMES - ${_component} + ${_upper_COMPONENT} HINTS - ${_ffmpeg_SEARCH_DIRS} + ${LIBDIR}/ffmpeg PATH_SUFFIXES lib64 lib ) |