mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-22 09:36:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge https://github.com/Itseez/opencv

Browse Source 
Keep up to date
This commit is contained in:
Nghia Ho 2013-07-31 06:10:57 +10:00
commit 27bcc0bf07
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gpucodec/CMakeLists.txt
View File

@ -11,7 +11,7 @@ ocv_add_module(gpucodec opencv_highgui)
ocv_module_include_directories()
ocv_glob_module_sources()
set(extra_libs ${HIGHGUI_LIBRARIES})
set(extra_libs "")
if(HAVE_NVCUVID)
list(APPEND extra_libs ${CUDA_CUDA_LIBRARY} ${CUDA_nvcuvid_LIBRARY})

4
modules/gpucodec/src/ffmpeg_video_source.cpp
View File

@ -45,10 +45,6 @@
#ifdef HAVE_NVCUVID
#if defined(HAVE_FFMPEG) && defined(BUILD_SHARED_LIBS) && !defined(WIN32)
#include "../src/cap_ffmpeg_impl.hpp"
#endif
using namespace cv;
using namespace cv::gpucodec;
using namespace cv::gpucodec::detail;

6
modules/highgui/src/cap_ffmpeg_api.hpp
View File

@ -7,9 +7,11 @@ extern "C"
#endif
#if defined WIN32 || defined _WIN32
#define OPENCV_FFMPEG_API __declspec(dllexport)
# define OPENCV_FFMPEG_API __declspec(dllexport)
#elif defined __GNUC__ && __GNUC__ >= 4
# define OPENCV_FFMPEG_API __attribute__ ((visibility ("default")))
#else
#define OPENCV_FFMPEG_API
# define OPENCV_FFMPEG_API
#endif
enum