From 36b5180aa186776e5fc7f7df6fff5b49da185f23 Mon Sep 17 00:00:00 2001 From: Roman Donchenko Date: Fri, 25 Oct 2013 15:48:01 +0400 Subject: [PATCH] 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. --- modules/gpu/src/ffmpeg_video_source.cpp | 2 +- modules/gpu/src/video_writer.cpp | 7 +------ modules/highgui/src/cap_ffmpeg.cpp | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/modules/gpu/src/ffmpeg_video_source.cpp b/modules/gpu/src/ffmpeg_video_source.cpp index 1e115d8..1ff3284 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(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 fe44a16..0937ad1 100644 --- 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 74c3e18..192c0da 100644 --- 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" -- 2.7.4