Revert "disabled video decoding under linux"

This reverts commit 889674ef43.
2012-12-20 13:31:22 +04:00
parent 660d23aa04
commit 11293d071f
17 changed files with 40 additions and 29 deletions
--- a/modules/gpu/src/ffmpeg_video_source.h
+++ b/modules/gpu/src/ffmpeg_video_source.h
@@ -46,7 +46,7 @@
 #include "precomp.hpp"
 #include "thread_wrappers.h"

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

 struct InputMediaStream_FFMPEG;