added another possible location for ffmpeg headers

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

diff --git a/opencv/CMakeLists.txt b/opencv/CMakeLists.txt
index cbe1298095b2e76f656949523ae41d1cb3da5c08..696b9118e72e6ace5d6f95d078975f4f535be35f 100644 (file)
--- a/opencv/CMakeLists.txt
+++ b/opencv/CMakeLists.txt
@@ -304,6 +304,11 @@ if(UNIX)
       CHECK_MODULE(libavutil HAVE_FFMPEG_UTIL)
       CHECK_MODULE(libswscale HAVE_FFMPEG_SWSCALE)
       CHECK_INCLUDE_FILE(libavformat/avformat.h HAVE_GENTOO_FFMPEG)
+      if(NOT HAVE_GENTOO_FFMPEG)
+        if(EXISTS /usr/include/ffmpeg/libavformat/avformat.h)
+          set(HAVE_GENTOO_FFMPEG 1)
+        endif()
+      endif()
       if(HAVE_FFMPEG_CODEC AND HAVE_FFMPEG_FORMAT AND HAVE_FFMPEG_UTIL)
         set(HAVE_FFMPEG 1)
       endif()
@@ -865,6 +870,10 @@ message(STATUS "  Video I/O: ")
 message(STATUS "    DC1394 1.x:                ${HAVE_DC1394}")
 message(STATUS "    DC1394 2.x:                ${HAVE_DC1394_2}")
 message(STATUS "    FFMPEG:                    ${HAVE_FFMPEG}")
+message(STATUS "      codec:                   ${HAVE_FFMPEG_CODEC}")
+message(STATUS "      format:                  ${HAVE_FFMPEG_FORMAT}")
+message(STATUS "      util:                    ${HAVE_FFMPEG_UTIL}")
+message(STATUS "      gentoo-style:            ${HAVE_GENTOO_FFMPEG}")
 message(STATUS "    GStreamer:                 ${HAVE_GSTREAMER}")
 message(STATUS "    UniCap:                    ${HAVE_UNICAP}")
 if(HAVE_LIBV4L)