fixed build under MacOS (disabled video decoding, it's not supported)

2012-05-11 11:48:15 +00:00
parent 91e312958b
commit 2dafc9a853
14 changed files with 25 additions and 17 deletions
--- a/modules/gpu/src/thread_wrappers.cpp
+++ b/modules/gpu/src/thread_wrappers.cpp
@@ -42,7 +42,7 @@

 #include "thread_wrappers.h"

-#ifdef HAVE_CUDA
+#if defined(HAVE_CUDA) && !defined(__APPLE__)

 #ifdef WIN32
    #define NOMINMAX