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

fix cap_ffmpeg.cpp build when no ffmpeg is found

Browse Source
This commit is contained in:
Vadim Pisarevsky
2011-07-03 23:45:35 +00:00
parent a31ad531f0
commit 391603e2e8
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/highgui/src/cap_ffmpeg.cpp
+4 -6
View File
@@ -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 =