From 1bbf9b7782931d352ca4f646f96dcc58c805c5a5 Mon Sep 17 00:00:00 2001 From: rdb Date: Fri, 22 Oct 2010 13:49:35 +0000 Subject: [PATCH] Don't get OpenCV webcam listing if we already have directcam or video4linux --- panda/src/vision/webcamVideo.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panda/src/vision/webcamVideo.cxx b/panda/src/vision/webcamVideo.cxx index a0bafd6f34..2e03b024da 100644 --- a/panda/src/vision/webcamVideo.cxx +++ b/panda/src/vision/webcamVideo.cxx @@ -60,7 +60,7 @@ find_all_webcams() { find_all_webcams_v4l(); #endif -#ifdef HAVE_OPENCV +#if defined(HAVE_OPENCV) && !defined(HAVE_DIRECTCAM) && !defined(HAVE_VIDEO4LINUX) extern void find_all_webcams_opencv(); find_all_webcams_opencv(); #endif