yet another attempt to make ffmpeg bindings to compile everywhere (checked on ubuntu...

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

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