From 391603e2e8cddc4761df54d154b07ae012bbc43b Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Sun, 3 Jul 2011 23:45:35 +0000 Subject: [PATCH] fix cap_ffmpeg.cpp build when no ffmpeg is found --- modules/highgui/src/cap_ffmpeg.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/highgui/src/cap_ffmpeg.cpp b/modules/highgui/src/cap_ffmpeg.cpp index 97042816f8..251ddc449b 100644 --- a/modules/highgui/src/cap_ffmpeg.cpp +++ b/modules/highgui/src/cap_ffmpeg.cpp @@ -41,12 +41,10 @@ #include "precomp.hpp" -#if defined WIN32 || defined _WIN32 -#include "cap_ffmpeg_api.hpp" - -static HMODULE icvFFOpenCV = 0; -#elif defined HAVE_FFMPEG +#ifdef HAVE_FFMPEG #include "cap_ffmpeg_impl.hpp" +#else +#include "cap_ffmpeg_api.hpp" #endif static CvCreateFileCapture_Plugin icvCreateFileCapture_FFMPEG_p = 0; @@ -72,7 +70,7 @@ icvInitFFMPEG(void) #endif ".dll"; - icvFFOpenCV = LoadLibrary( module_name ); + static HMODULE icvFFOpenCV = LoadLibrary( module_name ); if( icvFFOpenCV ) { icvCreateFileCapture_FFMPEG_p =