generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Another FFmpeg fix from master.

Browse Source 
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.
This commit is contained in:
Roman Donchenko 2013-10-25 15:48:01 +04:00
parent 1188894133
commit 36b5180aa1
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gpu/src/ffmpeg_video_source.cpp
View File

@ -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"

7
modules/gpu/src/video_writer.cpp
View File

@ -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

2
modules/highgui/src/cap_ffmpeg.cpp
View File

@ -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"