disable format 7 support in libdc1394 wrapper since it's broken anyway (ticket #82...

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

diff --git a/opencv/src/highgui/cvcap_dc1394_v2.cpp b/opencv/src/highgui/cvcap_dc1394_v2.cpp
index 023a5194342adc045e42338b9e59b5b875a3d8a9..86c69861450d8c58d678c8c971d069d412d29167 100644 (file)
--- a/opencv/src/highgui/cvcap_dc1394_v2.cpp
+++ b/opencv/src/highgui/cvcap_dc1394_v2.cpp
@@ -286,6 +286,8 @@ bool CvCaptureCAM_DC1394_v2_CPP::startCapture()
         for (i = 0; i < (int)videoModes.num; i++)
         {
             dc1394video_mode_t mode = videoModes.modes[i];
+                       if (mode >= DC1394_VIDEO_MODE_FORMAT7_MIN && mode <= DC1394_VIDEO_MODE_FORMAT7_MAX)
+                               continue;
             int pref = -1;
             dc1394color_coding_t colorCoding;
             dc1394_get_color_coding_from_video_mode(dcCam, mode, &colorCoding);