generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed static build of gpu module with ffmpeg:

Browse Source 
multiple definition of cap_ffmpeg_impl.hpp functions in gpu and highgui
This commit is contained in:
Vladislav Vinogradov 2012-11-08 15:49:56 +04:00
parent beb377b38c
commit bff818afbd
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gpu/src/ffmpeg_video_source.cpp
View File

@ -44,7 +44,7 @@
#if defined(HAVE_CUDA) && !defined(__APPLE__) #if defined(HAVE_CUDA) && !defined(__APPLE__)
#ifdef HAVE_FFMPEG #if defined(HAVE_FFMPEG) && defined(BUILD_SHARED_LIBS)
#include "cap_ffmpeg_impl.hpp" #include "cap_ffmpeg_impl.hpp"
#else #else
#include "cap_ffmpeg_api.hpp" #include "cap_ffmpeg_api.hpp"