Another FFmpeg fix from master.

From commit dd74a851, to be exact. Now cap_ffmpeg.cpp should actually
build if HAVE_FFMPEG is true.

Also modified some gpu sources in a similar manner.

diff --git a/modules/gpu/src/ffmpeg_video_source.cpp b/modules/gpu/src/ffmpeg_video_source.cpp
index 1e115d8b16202631dcf90396d1663718bae1b5b7..1ff3284fe282a64d6debff11efecbdaa4c6f7704 100644 (file)
--- 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(HAVE_NVCUVID)
 
-#if defined(HAVE_FFMPEG) && defined(BUILD_SHARED_LIBS)
+#if defined(HAVE_FFMPEG) && defined(BUILD_SHARED_LIBS) && !defined(WIN32)
     #include "../src/cap_ffmpeg_impl.hpp"
 #else
     #include "../src/cap_ffmpeg_api.hpp"

diff --git a/modules/gpu/src/video_writer.cpp b/modules/gpu/src/video_writer.cpp
index fe44a16f7cc544575ab726a584aaaf1a043210d8..0937ad1f270278e9126704b59c5ea7181610fe6b 100644 (file)
--- a/modules/gpu/src/video_writer.cpp
+++ b/modules/gpu/src/video_writer.cpp
@@ -70,12 +70,7 @@ void cv::gpu::VideoWriter_GPU::EncoderParams::save(const std::string&) const { t
 
 #else // !defined HAVE_CUDA || !defined WIN32
 
-#ifdef HAVE_FFMPEG
-    #include "../src/cap_ffmpeg_impl.hpp"
-#else
-    #include "../src/cap_ffmpeg_api.hpp"
-#endif
-
+#include "../src/cap_ffmpeg_api.hpp"
 
 ///////////////////////////////////////////////////////////////////////////
 // VideoWriter_GPU::Impl

diff --git a/modules/highgui/src/cap_ffmpeg.cpp b/modules/highgui/src/cap_ffmpeg.cpp
index 74c3e18cf566b88d591696f9729dbd92bdfc298c..192c0da694f963bd6cef1f3f11280797a68883a4 100644 (file)
--- a/modules/highgui/src/cap_ffmpeg.cpp
+++ b/modules/highgui/src/cap_ffmpeg.cpp
@@ -41,7 +41,7 @@
 
 #include "precomp.hpp"
 
-#ifdef HAVE_FFMPEG
+#if defined HAVE_FFMPEG && !defined WIN32
 #include "cap_ffmpeg_impl.hpp"
 #else
 #include "cap_ffmpeg_api.hpp"