diff options
| author | root <root@rshg047.dnsready.net> | 2011-04-14 04:54:18 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-04-14 04:54:18 +0000 |
| commit | 0917a0682e48c4261e47d743725d990f47f6ec95 (patch) | |
| tree | 32b99e036a20918da470922bf40276cedcfe7506 /testing/opencv/nov4l1.patch | |
| parent | 9c49791f6e912bd4834f00f2c6b3a00e6c12bb73 (diff) | |
Thu Apr 14 04:54:18 UTC 2011
Diffstat (limited to 'testing/opencv/nov4l1.patch')
| -rw-r--r-- | testing/opencv/nov4l1.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/testing/opencv/nov4l1.patch b/testing/opencv/nov4l1.patch new file mode 100644 index 000000000..cacdd77b7 --- /dev/null +++ b/testing/opencv/nov4l1.patch @@ -0,0 +1,25 @@ +diff -up OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp +--- OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 2011-02-02 16:55:22.844244001 +0100 ++++ OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp 2011-02-02 16:53:22.224244002 +0100 +@@ -214,7 +214,9 @@ make & enjoy! + #include <sys/types.h> + #include <sys/mman.h> + ++#ifdef HAVE_CAMV4L + #include <linux/videodev.h> ++#endif + + #include <string.h> + #include <stdlib.h> +diff -up OpenCV-2.2.0/modules/highgui/src/cap.cpp.nov4l1 OpenCV-2.2.0/modules/highgui/src/cap.cpp +--- OpenCV-2.2.0/modules/highgui/src/cap.cpp.nov4l1 2011-02-04 15:10:51.461243999 +0100 ++++ OpenCV-2.2.0/modules/highgui/src/cap.cpp 2011-02-04 15:11:22.040244001 +0100 +@@ -171,7 +171,7 @@ CV_IMPL CvCapture * cvCreateCameraCaptur + if (capture) + return capture; + #endif +- #if defined (HAVE_CAMV4L) || defined (HAVE_CAMV4L2) ++ #if defined (HAVE_CAMV4L) + capture = cvCreateCameraCapture_V4L (index); + if (capture) + return capture; |