Skip to content

O
opencv
Commit 391603e2 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky
Browse files
Options

fix cap_ffmpeg.cpp build when no ffmpeg is found

parent a31ad531
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
modules/highgui/src/cap_ffmpeg.cpp
View file @ 391603e2
...@@ -41,12 +41,10 @@ ...@@ -41,12 +41,10 @@
#include "precomp.hpp" #include "precomp.hpp"
#if defined WIN32 || defined _WIN32 #ifdef HAVE_FFMPEG
#include "cap_ffmpeg_api.hpp"
static HMODULE icvFFOpenCV = 0;
#elif defined HAVE_FFMPEG
#include "cap_ffmpeg_impl.hpp" #include "cap_ffmpeg_impl.hpp"
#else
#include "cap_ffmpeg_api.hpp"
#endif #endif
static CvCreateFileCapture_Plugin icvCreateFileCapture_FFMPEG_p = 0; static CvCreateFileCapture_Plugin icvCreateFileCapture_FFMPEG_p = 0;
...@@ -72,7 +70,7 @@ icvInitFFMPEG(void) ...@@ -72,7 +70,7 @@ icvInitFFMPEG(void)
#endif #endif
".dll"; ".dll";
icvFFOpenCV = LoadLibrary( module_name ); static HMODULE icvFFOpenCV = LoadLibrary( module_name );
if( icvFFOpenCV ) if( icvFFOpenCV )
{ {
icvCreateFileCapture_FFMPEG_p = icvCreateFileCapture_FFMPEG_p =
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment