potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages Releases Wiki Activity

fixed build for CARMA:

Browse Source 
- added CMake toolchain file
- added WITH_NVCUVID flag
This commit is contained in:
Vladislav Vinogradov
2013-01-23 15:32:49 +04:00
parent 9cb4292d5c
commit 395f0201e3
22 changed files with 141 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gpu/src/ffmpeg_video_source.cpp
+4 -4
View File
@@ -42,12 +42,12 @@
#include "ffmpeg_video_source.h"
#if defined(HAVE_CUDA) && !defined(__APPLE__)
#if defined(HAVE_CUDA) && defined(HAVE_NVCUVID)
#ifdef HAVE_FFMPEG
#include "cap_ffmpeg_impl.hpp"
#if defined(HAVE_FFMPEG) && defined(BUILD_SHARED_LIBS)
#include "../src/cap_ffmpeg_impl.hpp"
#else
#include "cap_ffmpeg_api.hpp"
#include "../src/cap_ffmpeg_api.hpp"
#endif
namespace