Skip to content

O
opencv
Commit 8ac96eec authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #6073 from alalek:fix_5897

parents b529b37d c10c8db9
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
cmake/OpenCVFindLibsVideo.cmake
View file @ 8ac96eec
...@@ -214,7 +214,7 @@ if(WITH_FFMPEG) ...@@ -214,7 +214,7 @@ if(WITH_FFMPEG)
CHECK_INCLUDE_FILE(libavformat/avformat.h HAVE_GENTOO_FFMPEG) CHECK_INCLUDE_FILE(libavformat/avformat.h HAVE_GENTOO_FFMPEG)
CHECK_INCLUDE_FILE(ffmpeg/avformat.h HAVE_FFMPEG_FFMPEG) CHECK_INCLUDE_FILE(ffmpeg/avformat.h HAVE_FFMPEG_FFMPEG)
if(NOT HAVE_GENTOO_FFMPEG AND NOT HAVE_FFMPEG_FFMPEG) if(NOT HAVE_GENTOO_FFMPEG AND NOT HAVE_FFMPEG_FFMPEG)
if(EXISTS /usr/include/ffmpeg/libavformat/avformat.h OR HAVE_FFMPEG_SWSCALE) if((NOT CMAKE_CROSSCOMPILING AND EXISTS /usr/include/ffmpeg/libavformat/avformat.h) OR HAVE_FFMPEG_SWSCALE)
set(HAVE_GENTOO_FFMPEG TRUE) set(HAVE_GENTOO_FFMPEG TRUE)
endif() endif()
endif() endif()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment