removed #include "cap_ffmpeg_impl_v2.hpp"

c65b7a99 · Vladislav Vinogradov · 860172c6 · c65b7a99 · c65b7a99
Commit c65b7a99 authored May 03, 2012 by Vladislav Vinogradov
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 10 deletions

ffmpeg_video_source.cpp modules/gpu/src/ffmpeg_video_source.cpp +1 -5

video_writer.cpp modules/gpu/src/video_writer.cpp +1 -5

No files found.
--- a/modules/gpu/src/ffmpeg_video_source.cpp
+++ b/modules/gpu/src/ffmpeg_video_source.cpp
@@ -45,11 +45,7 @@
 #ifdef HAVE_CUDA

 #ifdef HAVE_FFMPEG
-    #ifdef NEW_FFMPEG
-        #include "cap_ffmpeg_impl_v2.hpp"
-    #else
-        #include "cap_ffmpeg_impl.hpp"
-    #endif
+    #include "cap_ffmpeg_impl.hpp"
 #else
    #include "cap_ffmpeg_api.hpp"
 #endif

--- a/modules/gpu/src/video_writer.cpp
+++ b/modules/gpu/src/video_writer.cpp
@@ -71,11 +71,7 @@ void cv::gpu::VideoWriter_GPU::EncoderParams::save(const std::string&) const { t
 #else // !defined HAVE_CUDA || !defined WIN32

 #ifdef HAVE_FFMPEG
-    #ifdef NEW_FFMPEG
-        #include "cap_ffmpeg_impl_v2.hpp"
-    #else
-        #include "cap_ffmpeg_impl.hpp"
-    #endif
+    #include "cap_ffmpeg_impl.hpp"
 #else
    #include "cap_ffmpeg_api.hpp"
 #endif