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

removed #include "cap_ffmpeg_impl_v2.hpp"

Browse Source
This commit is contained in:
Vladislav Vinogradov 2012-05-03 08:34:14 +00:00
parent 860172c626
commit c65b7a9980
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,11 +45,7 @@
#ifdef HAVE_CUDA #ifdef HAVE_CUDA
#ifdef HAVE_FFMPEG #ifdef HAVE_FFMPEG
#ifdef NEW_FFMPEG
#include "cap_ffmpeg_impl_v2.hpp"
#else
#include "cap_ffmpeg_impl.hpp" #include "cap_ffmpeg_impl.hpp"
#endif
#else #else
#include "cap_ffmpeg_api.hpp" #include "cap_ffmpeg_api.hpp"
#endif #endif

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

@ -71,11 +71,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 #ifdef HAVE_FFMPEG
#ifdef NEW_FFMPEG
#include "cap_ffmpeg_impl_v2.hpp"
#else
#include "cap_ffmpeg_impl.hpp" #include "cap_ffmpeg_impl.hpp"
#endif
#else #else
#include "cap_ffmpeg_api.hpp" #include "cap_ffmpeg_api.hpp"
#endif #endif