Merge pull request #7897 from alalek:fix_ffmpeg_check

cmake: fix ffmpeg check code (port into master #7893)

Merge pull request #7897 from alalek:fix_ffmpeg_check
cmake: fix ffmpeg check code (port into master #7893)
ccd32f66 · Alexander Alekhin · GitHub · 2638abe1 · 3e1695d6 · ccd32f66
Commit ccd32f66 authored Dec 19, 2016 by Alexander Alekhin Committed by GitHub Dec 19, 2016
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

OpenCVFindLibsVideo.cmake cmake/OpenCVFindLibsVideo.cmake +1 -0

No files found.
--- a/cmake/OpenCVFindLibsVideo.cmake
+++ b/cmake/OpenCVFindLibsVideo.cmake
@@ -236,6 +236,7 @@ if(WITH_FFMPEG)
      if(NOT __VALID_FFMPEG)
        #message(FATAL_ERROR "FFMPEG: test check build log:\n${TRY_OUT}")
        message(STATUS "WARNING: Can't build ffmpeg test code")
+        set(HAVE_FFMPEG FALSE)
      else()
        ocv_append_build_options(VIDEOIO FFMPEG)
      endif()