added libswscale check to avoid cvcap_ffmpeg.cpp compile errors; this is not 100...

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

diff --git a/opencv/CMakeLists.txt b/opencv/CMakeLists.txt
index 9e452f08d937e779c54ec0f36f763e9e24d336d3..76ab0fb85b908b04753a203584022794a7312cf2 100644 (file)
--- a/opencv/CMakeLists.txt
+++ b/opencv/CMakeLists.txt
@@ -298,6 +298,7 @@ if(UNIX)
       set(HAVE_UNICAP FALSE)\r
     endif()\r
 \r
+    set(HAVE_FFMPEG 0)\r
     if(WITH_FFMPEG)\r
       CHECK_MODULE(libavcodec HAVE_FFMPEG_CODEC)\r
       CHECK_MODULE(libavformat HAVE_FFMPEG_FORMAT)\r
@@ -310,10 +311,10 @@ if(UNIX)
         endif()\r
       endif()\r
       if(HAVE_FFMPEG_CODEC AND HAVE_FFMPEG_FORMAT AND HAVE_FFMPEG_UTIL)\r
-        set(HAVE_FFMPEG 1)\r
+        if(HAVE_FFMPEG_SWSCALE OR NOT HAVE_GENTOO_FFMPEG)\r
+            set(HAVE_FFMPEG 1)\r
+        endif()    \r
       endif()\r
-    else()\r
-      set(HAVE_FFMPEG FALSE)\r
     endif()\r
 \r
     if(WITH_1394)\r
@@ -860,6 +861,7 @@ message(STATUS "    FFMPEG:                    ${HAVE_FFMPEG}")
 message(STATUS "      codec:                   ${HAVE_FFMPEG_CODEC}")\r
 message(STATUS "      format:                  ${HAVE_FFMPEG_FORMAT}")\r
 message(STATUS "      util:                    ${HAVE_FFMPEG_UTIL}")\r
+message(STATUS "      swscale:                 ${HAVE_FFMPEG_SWSCALE}")\r
 message(STATUS "      gentoo-style:            ${HAVE_GENTOO_FFMPEG}")\r
 message(STATUS "    GStreamer:                 ${HAVE_GSTREAMER}")\r
 message(STATUS "    UniCap:                    ${HAVE_UNICAP}")\r