From bff818afbd3feca29b8b4ef10b5be68aa5ada7f1 Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Thu, 8 Nov 2012 15:49:56 +0400 Subject: [PATCH] fixed static build of gpu module with ffmpeg: multiple definition of cap_ffmpeg_impl.hpp functions in gpu and highgui --- modules/gpu/src/ffmpeg_video_source.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/gpu/src/ffmpeg_video_source.cpp b/modules/gpu/src/ffmpeg_video_source.cpp index a0f420507..7538de601 100644 --- a/modules/gpu/src/ffmpeg_video_source.cpp +++ b/modules/gpu/src/ffmpeg_video_source.cpp @@ -44,7 +44,7 @@ #if defined(HAVE_CUDA) && !defined(__APPLE__) -#ifdef HAVE_FFMPEG +#if defined(HAVE_FFMPEG) && defined(BUILD_SHARED_LIBS) #include "cap_ffmpeg_impl.hpp" #else #include "cap_ffmpeg_api.hpp"