Commit 36b5180a authored by Roman Donchenko's avatar Roman Donchenko

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.
parent 11888941
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
#if defined(HAVE_CUDA) && defined(HAVE_NVCUVID) #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" #include "../src/cap_ffmpeg_impl.hpp"
#else #else
#include "../src/cap_ffmpeg_api.hpp" #include "../src/cap_ffmpeg_api.hpp"
......
...@@ -70,12 +70,7 @@ void cv::gpu::VideoWriter_GPU::EncoderParams::save(const std::string&) const { t ...@@ -70,12 +70,7 @@ void cv::gpu::VideoWriter_GPU::EncoderParams::save(const std::string&) const { t
#else // !defined HAVE_CUDA || !defined WIN32 #else // !defined HAVE_CUDA || !defined WIN32
#ifdef HAVE_FFMPEG #include "../src/cap_ffmpeg_api.hpp"
#include "../src/cap_ffmpeg_impl.hpp"
#else
#include "../src/cap_ffmpeg_api.hpp"
#endif
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// VideoWriter_GPU::Impl // VideoWriter_GPU::Impl
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#include "precomp.hpp" #include "precomp.hpp"
#ifdef HAVE_FFMPEG #if defined HAVE_FFMPEG && !defined WIN32
#include "cap_ffmpeg_impl.hpp" #include "cap_ffmpeg_impl.hpp"
#else #else
#include "cap_ffmpeg_api.hpp" #include "cap_ffmpeg_api.hpp"
......
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