another attempt to make cvcap_ffmpeg.cpp compile in different non-standard configurations

git-svn-id: https://code.ros.org/svn/opencv/trunk@2168 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/CMakeLists.txt b/opencv/CMakeLists.txt
index a0f14c304b28c0e16ee8669d497d779c549e5f5f..bcc371864859567d5ad5cd564c4913a2b4b282c0 100644 (file)
--- a/opencv/CMakeLists.txt
+++ b/opencv/CMakeLists.txt
@@ -306,7 +306,7 @@ if(UNIX)
       CHECK_MODULE(libswscale HAVE_FFMPEG_SWSCALE)\r
       CHECK_INCLUDE_FILE(libavformat/avformat.h HAVE_GENTOO_FFMPEG)\r
       if(NOT HAVE_GENTOO_FFMPEG)\r
-        if(EXISTS /usr/include/ffmpeg/libavformat/avformat.h)\r
+        if(EXISTS /usr/include/ffmpeg/libavformat/avformat.h OR HAVE_FFMPEG_SWSCALE)\r
           set(HAVE_GENTOO_FFMPEG 1)\r
         endif()\r
       endif()\r